diff --git a/.agents b/.agents new file mode 120000 index 0000000000..c8161850a4 --- /dev/null +++ b/.agents @@ -0,0 +1 @@ +.claude \ No newline at end of file diff --git a/.claude/skills/orca-profiles/SKILL.md b/.claude/skills/orca-profiles/SKILL.md index 3b2130660f..40ab8c9927 100644 --- a/.claude/skills/orca-profiles/SKILL.md +++ b/.claude/skills/orca-profiles/SKILL.md @@ -1,78 +1,127 @@ --- name: orca-profiles -description: Use when creating, modifying, reviewing or debugging OrcaSlicer FFF system profiles under resources/profiles, including printer/vendor/nozzle/material additions, bundle indexes and versions, preset renames, setting_id and filament_id. Also use for missing presets or vendors, ignored profile settings, ambiguous AMS filament matches, and failures from orca_profile_tool.py, check_profile.sh/.bat, OrcaSlicer_profile_validator or the Check profiles CI job. +description: Use when creating, modifying, reviewing or debugging OrcaSlicer FFF system profiles under resources/profiles, including printer/vendor/nozzle/material additions, bundle indexes and versions, preset renames, setting_id and filament_id, and moving settings that sibling presets repeat onto shared bases after fix-variant or while drafting. Also use for missing presets or vendors, ignored profile settings, ambiguous AMS filament matches, and failures from orca_profile_tool.py, check_profile.sh/.bat, OrcaSlicer_profile_validator or the Check profiles CI job. --- # OrcaSlicer system profiles -A bundle is `resources/profiles/.json` plus `/`. The vendor id is the -filename stem, not the index's display `name`. The index is the loader's only entry point: -unindexed presets never load. `OrcaFilamentLibrary` is the shared filament bundle; -`blacklist.json` is data, not a bundle. +This skill describes how OrcaSlicer system profiles are drafted and shaped: the rules, equations and +patterns a profile follows. Use it to draft new profiles, modify existing ones, fix profile issues and +review profile changes. -## Choose the reference for the task +A bundle is the index `resources/profiles/.json` plus the folder `/`. The vendor id is +the filename stem (`BBL`), not the index's display `name` (`Bambulab`). The index is the loader's only +entry point: an unindexed preset never loads. `OrcaFilamentLibrary` is the shared filament bundle, +loaded first; `blacklist.json` is data, not a bundle. -Read the relevant reference before editing; load others only when the task crosses those areas. -Paths below are relative to this skill. Commands run from the repository root. +## References + +Read the reference for the task before editing; load others only when the task crosses into them. +Paths below are relative to this skill. Commands run from the repository root; on Windows use `py -3` +for `python3`. | Task | Read | | --- | --- | -| Add or tune a filament, brand or material; fix compatibility / alias shadowing | [filament-profiles.md](references/filament-profiles.md) | -| Add a printer or nozzle; change models, variants, assets or extruder vectors | [machine-profiles.md](references/machine-profiles.md) | +| Add or tune a filament, brand or material; fix compatibility, alias shadowing or overlapping coverage | [filament-profiles.md](references/filament-profiles.md) | +| Add a printer or nozzle; change models, variants, assets or per-extruder vectors | [machine-profiles.md](references/machine-profiles.md) | +| Add or tune extruder variants (`extruder_type` Direct Drive / Bowden × nozzle volume type Standard / High Flow / TPU High Flow / E3D High Flow / Extra High Flow variants) on a printer, process or filament | [extruder-variants.md](references/extruder-variants.md) | | Add a quality tier or tune a process | [process-profiles.md](references/process-profiles.md) | -| Create a vendor bundle; diagnose loading or inheritance; migrate preset names | [vendor-bundle.md](references/vendor-bundle.md) | -| Name a preset; check what a name must equal | [naming.md](references/naming.md) | +| Draft several presets, or clean up after `fix-variant`: which base each shared value belongs on, when a new base pays off, proving nothing loads differently | [shared-bases.md](references/shared-bases.md) | +| Name a preset; check what a name must equal; base names, uniqueness, filenames | [naming.md](references/naming.md) | +| Create a vendor bundle; index, `version`, `inherits`, `include`; migrate preset names; diagnose why a bundle fails to load | [vendor-bundle.md](references/vendor-bundle.md) | | Change ids; diagnose AMS identity | [ids.md](references/ids.md), then `docs/HLSD/filament_id.md` for identity changes | -| Review a profile diff | [review-checklist.md](references/review-checklist.md) | | Run checks, interpret failures, test another tree or verify in the app | [validation.md](references/validation.md) | +| Review a profile diff | [review-checklist.md](references/review-checklist.md) | -## Golden rules +## Rules -1. **Bump every changed bundle's `version`**, including `OrcaFilamentLibrary.json` when affected. - Increment the last component; carry `.99` into the third component (`02.04.00.99` → - `02.04.01.00`). The updater requires a strictly newer version. CI does not check this. -2. **Register every preset, bases included, parents before children.** `update-index` generates - the four `*_list` arrays; `check` requires its output. Index names must equal file `name` fields. -3. **Generate ids; never invent or copy them.** Keep existing ids during ordinary tuning. New - presets normally omit them until `generate-id`; bases must have no `setting_id`. - BBL's authoritative `setting_id` and a wrongly inherited `filament_id` need the explicit - handling in [ids.md](references/ids.md). -4. **Load failures can discard a whole vendor bundle.** Broken `inherits`, missing indexed files, - duplicate names, invalid model/variant references and unresolved filament ids affect more than - the edited preset. Inheritance stays within a bundle, except filaments may inherit the library. -5. **Preserve shipped selectable names.** Renaming, deleting or changing `instantiation` from - `"true"` to `"false"` needs `renamed_from` on a selectable successor. It is a `;`-separated string; - update in-tree references too. See [migration rules](references/vendor-bundle.md#renamed_from). -6. **Compatibility uses exact printer variant names.** Every instantiated non-library filament - needs a non-empty `compatible_printers` in its own file. Library fallbacks may omit it; - library printer-specific tunes use a non-empty list. One variant may be claimed by only one - profile per filament product (`filament_id`); an overlap is resolved by moving the variant to the - most specific preset, which is preferred over deleting a profile. See - [one variant, one profile](references/filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product). -7. **Preset values are strings or arrays of strings.** Use `"instantiation": "false"`, not `false`. - Model `nozzle_diameter` is a `;`-separated string; machine `nozzle_diameter` is an array. - Wrong types can abort loading; see [failure scopes](references/vendor-bundle.md#failure-modes-ranked-by-blast-radius). -8. **Verify setting keys against the code.** Unknown keys are silently discarded. Check - `PrintConfig.cpp` definitions and `PrintConfigDef::handle_legacy`; neighbours can contain dead - keys. `normalize` removes known obsolete keys, but does not detect arbitrary misspellings. -9. **Run the full profile checks before reporting completion.** A vendor-scoped pass is only a - development loop. Review also covers version bumps, assets, non-default processes and hardware - tuning that CI cannot establish. -10. **One all-printer preset per product; color is a runtime property, never a preset.** Never ship - presets that differ only by color — CI accepts them, so this is a review call. See - [color is a runtime property](references/filament-profiles.md#color-is-a-runtime-property). +1. **Bump the `version` of every bundle you change**, `OrcaFilamentLibrary.json` included when affected. + Increment the last component and carry `.99` into the third (`02.04.00.99` → `02.04.01.00`). The + updater installs only a strictly newer version, and CI does not check the bump. +2. **Register every preset, bases included, parents before children.** `update-index` writes the four + `*_list` arrays from the files on disk; `check` fails unless the index equals its output. Each index + entry's `name` must equal the file's `name`. +3. **Generate ids; never invent or copy them.** Keep existing ids during ordinary tuning. New presets + normally omit them until `generate-id`; bases carry no `setting_id`. BBL's own `setting_id`s and a wrongly + inherited `filament_id` need the explicit handling in [ids.md](references/ids.md). +4. **A name is an identity; preserve shipped selectable names.** Every reference (`inherits`, + `compatible_printers`, `default_*`, `printer_model`) is the exact, case-sensitive `name`. Renaming or + deleting a shipped selectable preset, or flipping its `instantiation` from `"true"` to `"false"`, + needs `renamed_from` (a `;`-separated string) on a selectable successor + ([migration rules](references/vendor-bundle.md#renamed_from)); update in-tree references too. +5. **Values are strings or arrays of strings.** `"instantiation": "false"`, never `false`. A + `machine_model`'s `nozzle_diameter` is a `;`-separated string; a `machine`'s is an array. Custom + G-code is one string. Wrong types can abort loading of the bundle or of every vendor + ([failure scopes](references/vendor-bundle.md#failure-scopes)). +6. **Unknown keys are dropped silently.** Confirm every new key exists in + `src/libslic3r/PrintConfig.cpp`; a key a neighbouring file writes is no evidence it exists. `check` rejects, + and `normalize` removes, known obsolete keys, but neither detects an arbitrary misspelling. A key + missing from the definitions may be a legacy name the loader still renames + (`tool_change_gcode` → `change_filament_gcode`) or whose value it rewrites (`DirectDrive` → + `Direct Drive`); check `PrintConfigDef::handle_legacy` before removing one, and write the current name + in new edits. +7. **Write overrides only.** Inherit the bundle's bases and restate just what differs; follow the + bundle's existing layering and style, except that a new filament prefers the library's bases. A + value that every preset of a group shares goes on the group's base + ([shared bases](references/shared-bases.md)). +8. **One load error can discard a whole vendor bundle**: an unresolved `inherits`, a missing indexed + file, two selectable presets with one name, an unknown `printer_model` or `printer_variant`, a + filament with no resolvable `filament_id`, `nil` in a non-nullable key. `inherits` and `include` + resolve only inside the bundle, except that filaments may inherit from OrcaFilamentLibrary. +9. **Filament compatibility names exact printer variants.** Every instantiated filament outside the + library writes a non-empty `compatible_printers` in its own file. Library fallbacks may omit it; + library printer-specific tunes use a non-empty list. One variant may be claimed by only one preset + per filament product (`filament_id`); an overlap is resolved by moving the variant to the most + specific preset, which is preferred over deleting a preset + ([one variant, one profile](references/filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product)). +10. **One all-printer preset per product; colour is a runtime property, never a preset.** Never ship + presets that differ only by colour. CI accepts them, so this is a review call + ([colour](references/filament-profiles.md#colour-is-a-runtime-property)). +11. **Write a variant key at full width or not at all.** A key in the four variant sets holds exactly + `N` values in the selectable preset that writes it, `N = S × k` in the + [sizing equation](references/extruder-variants.md#sizing-equation): one per variant, a (normal, + silent) pair per variant for the `machine_max_*` limits; one value is not "the same for every + variant". Profiles must be correct as written: `check` judges each selectable preset by the + equation, never by what the loader pads or cuts, and `check --strict` also holds what a preset + inherits to its own width, as BBL writes it. A base is never judged on its own: its array widths + count, under `--strict`, where they reach a preset, while the id and layout rules judge the + composed preset, inherited values included, without it. Declare the variant layout on a + multi-extruder printer whose extruders need different values + ([widths](references/extruder-variants.md#widths)). +12. **Run the full checks before reporting completion.** A `--vendor` run is only a development loop. + Review also covers version bumps, assets, non-default processes and hardware tuning, which CI cannot + establish. + +## Names + +| Type | Shape | What the loader uses | +| --- | --- | --- | +| `machine_model` | `` (`Bambu Lab X1 Carbon`) | the exact string, named by each variant's `printer_model`; also the `_cover.png` stem | +| `machine` | ` nozzle` | the exact string, named by `compatible_printers`; `printer_variant` holds the nozzle token (`0.4`, [rules](references/machine-profiles.md#printer_model-and-printer_variant)) | +| `process` | `mm @` | the exact string when referenced or selected; `@` is a label, compatibility comes from the preset's list or condition | +| `filament` | ` @` | text before the first `@` is the alias (shadowing, `filament_id`); the rest is a label, with reserved targets `@base` and `@System` | + +The shapes are convention; `check` enforces only uniqueness. Per-type conventions, base names and +filename rules are in [naming.md](references/naming.md). ## Creating or modifying a profile -1. **Inspect the diff and neighbouring presets.** Read their `name`, parent chain and children; - edits to a base or a leaf with descendants propagate. Match the bundle's structure and write +1. **Inspect the diff and the neighbouring presets.** Read their `name`, parent chain and children: + edits to a base, or to a leaf that others inherit, propagate. Match the bundle's structure and write only overrides. New files use tab indentation, LF and a trailing newline; preserve unrelated - formatting in existing files. Match filename case exactly and use cross-platform names. -2. **Author explicit metadata.** Set `type` yourself, especially for `machine` vs `machine_model`. - Use `"from": "system"` and string `instantiation` on config presets. Omit ids on new presets - unless [ids.md](references/ids.md) requires special handling; retain them on existing ones. - Complete compatibility, defaults, assets and any rename migration using the task reference. -3. **Bump the version**, then run the authoring commands in order for each affected bundle: + formatting in existing files. Match filename case exactly and use + [cross-platform names](references/naming.md#filenames-and-paths). +2. **Author explicit metadata.** Set `type` yourself (`machine` vs `machine_model` especially), and use + `"from": "system"` and a string `instantiation` on config presets. Omit ids on new presets unless + [ids.md](references/ids.md) requires special handling; retain them on existing ones. Complete + compatibility, defaults, assets and any rename migration using the task reference. +3. **Put shared values on shared bases** when drafting several presets, and after `fix-variant`, which + widens an array in every preset that writes it and moves nothing. Each value goes on the base of the + level that determines it, a new base only where it pays for itself, and a restructure must leave + every selectable preset loading what it loaded: `snapshot` before the edit, `compare` after it + ([shared-bases.md](references/shared-bases.md)). +4. **Bump the version**, then run the authoring commands in order for each affected bundle, reading + every diff and resolving every error before moving on: ```bash python3 scripts/orca_profile_tool.py normalize --vendor "" @@ -81,46 +130,59 @@ Paths below are relative to this skill. Commands run from the repository root. python3 scripts/orca_profile_tool.py check ``` - Writing commands support `--dry-run`. Inspect their diffs: `normalize` changes content and can - reformat entire files. Stop and resolve command errors before proceeding. - - **Do not use `trim` in this workflow:** it can delete newly authored, unindexed profiles. - Do not use `normalize --force` for routine edits. -4. **Validate:** + Writing commands accept `--dry-run`. `normalize` changes content and can reformat entire files; + rerun `update-index` after any change to `inherits` or `include`, since it orders by them. + **Do not use `trim` in this workflow:** it deletes unindexed files, including one you just added. Do + not use `normalize --force` for routine edits. An error in a bundle you did not touch predates your + change: confirm it on a clean checkout and report it rather than fixing it in the same change. +5. **Validate:** ```bash ./scripts/check_profile.sh --vendor "" # development loop ./scripts/check_profile.sh # full tree before the PR ``` - On Windows use `py -3` instead of `python3`, and `scripts\check_profile.bat -Vendor ""` - / `scripts\check_profile.bat`. Logs land in a per-user cache dir (see - [validation.md](references/validation.md)). - Id checks remain tree-wide under `--vendor`; filament-only bundles skip the default slice check. - See [validation.md](references/validation.md) for flags, coverage and error remedies. -5. **Verify the changed behavior.** Slice newly added non-default processes explicitly, and - [test in the app](references/validation.md#testing-in-the-app) for selection or UI behavior. - Report checks actually run, failures/skips and any hardware tuning still unverified. + On Windows use `scripts\check_profile.bat -Vendor ""` / `scripts\check_profile.bat`. Logs + land in a per-user cache dir ([validation.md](references/validation.md)). Id checks stay tree-wide + under `--vendor`, and filament-only bundles skip the default slice check. Under `--vendor` read only + `profile_tool` and `validate_slice`: the other three checks fail on library presets that name other + vendors' printers ([why](references/validation.md#the-five-checks)). +6. **Verify the changed behaviour.** Slice newly added non-default processes and filaments + [explicitly](references/validation.md#checking-a-copy-of-the-tree), and + [test in the app](references/validation.md#testing-in-the-app) for selection or UI behaviour. Report + the checks actually run, their failures and skips, and any hardware tuning still unverified. -## Symptom → first reference +## Symptom → first look | Symptom | Start here | | --- | --- | -| A vendor disappears | Loader log / `validate_system`; [bundle failure scopes](references/vendor-bundle.md#failure-modes-ranked-by-blast-radius) | -| A setting has no effect | Key spelling/type, `handle_legacy`, or a config key placed on a `machine_model` | -| A preset exists but is not selectable | Index registration, `instantiation`, installation and compatibility | -| A filament is missing, duplicated, or matches the wrong spool | [Compatibility and alias shadowing](references/filament-profiles.md#compatible_printers); [ids](references/ids.md) | -| Presets differ only by color, or an all-printer library preset lacks `@System` | [Color is a runtime property](references/filament-profiles.md#color-is-a-runtime-property) | -| A bed temperature is ignored | [Plate-specific temperature keys](references/filament-profiles.md#bed-temperature-is-twelve-keys-not-one) | -| A change is absent from the running app | Version bump and [installed profile location](references/validation.md#testing-in-the-app) | -| A check fails | [Error → remedy](references/validation.md#error--remedy) | +| A vendor disappears | the app's log or the `validate_system` log; [failure scopes](references/vendor-bundle.md#failure-scopes) | +| A setting has no effect | key spelling or a legacy name (`PrintConfigDef::handle_legacy`), value type, or a config key placed on a `machine_model` | +| A preset exists but is not selectable | index registration, `instantiation`, whether it is installed (chosen in the setup wizard, or listed in the model's `default_materials`), compatibility | +| A filament is missing, duplicated, or matches the wrong spool | [compatibility and alias shadowing](references/filament-profiles.md#compatible_printers), [ids](references/ids.md) | +| Presets differ only by colour, or an all-printer library preset lacks `@System` | [colour is a runtime property](references/filament-profiles.md#colour-is-a-runtime-property) | +| High Flow (or a second extruder) slices with Standard (or extruder 1) values; a variant switch is missing; a variant's tuned values never arrive | [extruder variants](references/extruder-variants.md#variant-strings), [widths](references/extruder-variants.md#widths), [variant names](references/validation.md#variant-names) | +| Values land on the wrong extruder or mode after a variant was added | [inserting a variant](references/extruder-variants.md#adding-a-variant-inserts-its-values-at-its-variant-index), [padding and composition](references/extruder-variants.md#padding-truncation-and-composition) | +| A resolved value matches neither the file nor its `inherits` parent; an array is not the width the file wrote, or a child got only a base's first value | [composition order and `include`](references/vendor-bundle.md#inherits-and-include) | +| A bed temperature is ignored | [the twelve plate keys](references/filament-profiles.md#bed-temperature-is-twelve-keys-not-one) | +| A change is absent from the running app | version bump and [installed profile location](references/validation.md#testing-in-the-app) | +| A check fails | [error → remedy](references/validation.md#error--remedy) | ## Source of truth -When guidance and behavior disagree, inspect the current checkout: -`scripts/orca_profile_tool.py` for tooling and flags; `src/libslic3r/Preset*.cpp` for loading and -compatibility; `src/libslic3r/PrintConfig.cpp` for setting types and legacy handling; -`src/dev-utils/OrcaSlicer_profile_validator.cpp` and `.github/workflows/check_profiles.yml` for -validation coverage. `docs/HLSD/filament_id.md` defines filament identity. The -[profile development guide](https://github.com/OrcaSlicer/OrcaSlicer_WIKI/blob/main/developer_reference/how_to_create_profiles.md) +When this skill and the checkout disagree, the checkout wins: `scripts/orca_profile_tool.py` for the +tool and its flags; `src/libslic3r/Preset*.cpp` for loading and compatibility; +`src/libslic3r/PrintConfig.cpp` for keys, types, nullable options, the variant key sets and legacy +handling; `src/dev-utils/OrcaSlicer_profile_validator.cpp` and `.github/workflows/check_profiles.yml` +for validation coverage; `docs/HLSD/filament_id.md` for filament identity. The wiki's +[profile guide](https://github.com/OrcaSlicer/OrcaSlicer_WIKI/blob/main/developer_reference/how_to_create_profiles.md) is a tutorial; confirm loader and CLI details against these sources. + +## Editing this skill + +The skill describes what a profile must be, not what the shipped tree currently is. State rules, +equations, patterns and profile shapes; never inventories of shipped defects, counts, dated +measurements or lists of which vendors do what. Test each sentence: if editing the profiles alone, +with the engine and tool unchanged, could make it false, state the rule behind it or give a generic +example instead. Example files named as models to copy, and commit hashes cited as the reason for a +rule, are fine. diff --git a/.claude/skills/orca-profiles/references/extruder-variants.md b/.claude/skills/orca-profiles/references/extruder-variants.md new file mode 100644 index 0000000000..322d79d56f --- /dev/null +++ b/.claude/skills/orca-profiles/references/extruder-variants.md @@ -0,0 +1,548 @@ +# Extruder variants + +Use this when a printer's hotend or extruder can be in more than one hardware configuration that +needs different settings: a Standard and a High Flow nozzle, a TPU High Flow, E3D High Flow or Extra High Flow nozzle, or +a Direct Drive and a Bowden extruder on one machine. Variants let one printer, process and filament preset carry a +separate value per configuration; the user picks the configuration in the sidebar, and slicing uses +the matching values. They are not for nozzle **diameter**: that stays one `machine` preset per +`printer_variant`. + +## Variant strings + +- A **variant string** is `" "`: the extruder's `extruder_type` + value, a space, and its nozzle volume type (the project's `nozzle_volume_type`, seeded by the + printer preset's `default_nozzle_volume_type`), e.g. `"Direct Drive High Flow"`. +- A **variant** is one entry of a preset's variant list, named by its variant string (plus an extruder + id for printer and process lists). A variant-aware key holds **one value per variant** (a + (normal, silent) pair for the `machine_max_*` limits), and each preset declares its variants in + that list. Slicing picks, for each extruder, the variant whose + variant string equals the current `extruder_type` + nozzle volume type. +- Matching is an **exact string compare** of the whole string (plus the extruder id for printer and + process lists) against the preset's own resolved list, in any order. With no match the **first + variant** is used, silently: variant index 0 for printer and process keys (extruder 1's first + variant, whichever extruder asks), the filament's own first variant for filament keys. Printer and + process keys are matched only on a printer with several extruders or whose + `extruder_variant_list` offers several variant strings (`support_different_extruders`); on any + other printer their variant index 0 is read whatever it names. Nothing rejects a profile for a + variant mismatch; mistakes surface only as wrong values in the G-code. +- Variant index and array length follow [Widths](#widths). + +The complete enum is `s_keys_map_ExtruderType` and `s_keys_map_NozzleVolumeType` in +`src/libslic3r/PrintConfig.cpp` (`grep -A5 s_keys_map_NozzleVolumeType` there to confirm): + +| Part | Values | +| --- | --- | +| Extruder type | `Direct Drive`, `Bowden` | +| Nozzle volume type | `Standard`, `High Flow`, `TPU High Flow`, `E3D High Flow`, `Extra High Flow` (`Hybrid` exists but is runtime-only) | + +So the ten legal variant strings are the two extruder types × the five writable nozzle volume types, +and this table is the whole test of legality: a string's presence in a shipped profile is no evidence +for it. `Hybrid` (an extruder with several sub-nozzles) is never a variant: a filament on it reads the +variant of its own nozzle volume type from the project's `filament_volume_map`, printer and process +keys get one variant per nozzle volume type the extruder holds (`extruder_nozzle_stats`), and any +other lookup reads `Standard`. Never write it in a variant string. The same per-filament and +per-type reading applies on any extruder once `extruder_nozzle_stats` lists more nozzle volume +types than there are extruders. + +Every other string (a nozzle volume type name from another slicer, a typo, a variant copied from a +shipped profile) is a **dead variant**: nothing selects it, and since lookup is by string it does not +shift the variants beside it; it still counts toward the variant length when arrays are sized. +`orca_profile_tool.py check` reports it as an error in every bundle, BBL included +([variant names](validation.md#variant-names)). Legacy names are errors too: in the four variant +lists, `default_nozzle_volume_type` and `nozzle_volume_type`, the loader still rewrites `Normal` → +`Standard` and `Big Traffic` → `High Flow`, so a ported `Direct Drive Normal` variant would load, but +`check` rejects the spelling and names the enum name to write. `DirectDrive` is rewritten only in +`extruder_type`, so `DirectDrive Standard` in a variant list is dead. Write the enum names; +`normalize` does not convert them. + +### A nozzle the enum does not name + +The nozzle volume types are fixed by the engine, and a profile cannot add one. A nozzle the table does +not name needs the type added in code first, which is outside profile work; until then any string +for it is a dead variant. Once the engine has the type, its variant string is the enum name after +the extruder type, e.g. `"Direct Drive "`, and `check` accepts it with no tool change, since it +reads the enum from `PrintConfig.cpp`. Existing arrays are unaffected +([slice time](#slice-time-and-existing-users)). + +## When to use variants + +| Hardware | Do | +| --- | --- | +| One extruder, one nozzle type | Nothing. Without a variant list the printer has one variant ([variant length](#widths)) and no printer-key lookup takes place; a filament with several variants still gets the one for the printer's variant string. | +| Bowden-only printer | Nothing either. A list-less printer matches no string, so every printer-key lookup reads variant index 0 whether that variant is called `"Bowden Standard"` or `"Direct Drive Standard"`; naming it is cosmetic while it is the printer's only variant. A multi-extruder Bowden printer that declares the layout writes `"Bowden Standard"` variants: `"Direct Drive Standard"` entries match none of its extruders, so every extruder reads variant index 0 (and `check` reports them under [Printer rule 3](#printer-machine)). A filament with a `"Bowden Standard"` variant does get that variant there. | +| Nozzle types the user swaps (Standard / High Flow / TPU High Flow / E3D High Flow / Extra High Flow) | The printer lists them as variants; tune the keys that really differ per nozzle volume type. | +| Extruders of different types on one machine | One `extruder_type` per extruder, each extruder listing its own variants. | +| Several extruders that need different values in a variant key (retraction, z-hop, `nozzle_volume`, the `machine_max_*` limits) | Declare the layout even with a single nozzle volume type: `extruder_variant_list` with one `" Standard"` per extruder, and the flattened pair. Without it the arrays still hold one value per extruder ([variant length](#widths)), but the loader keeps only extruder 1's value of a list-less printer's arrays, so every extruder prints with it. | + +A preset without variant keys keeps working on a variant printer: its single variant is applied to +every extruder. So adding variants to a printer does not break existing processes or library +filaments; it only makes per-variant tuning possible. + +## Printer (`machine`) + +```json +"extruder_type": ["Direct Drive", "Direct Drive"], +"extruder_variant_list": ["Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive TPU High Flow"], +"printer_extruder_id": ["1", "1", "2", "2", "2"], +"printer_extruder_variant": ["Direct Drive Standard", "Direct Drive High Flow", + "Direct Drive Standard", "Direct Drive High Flow", "Direct Drive TPU High Flow"], +"default_nozzle_volume_type": ["Standard", "Standard"] +``` + +Rules: + +1. `extruder_variant_list` has **one entry per extruder**; each entry is the `,`-joined variants that + extruder supports. It is the per-extruder menu the sidebar offers. It is in no + [variant set](#the-four-key-sets), so the variant-length resize leaves it alone. Extruder 1's + first variant, variant index 0 of the flattened pair, is the fallback of every extruder whose + variant is missing when the arrays are collapsed for slicing + ([slice time](#slice-time-and-existing-users)); it is not necessarily the configuration the user + sees, which is `default_nozzle_volume_type` (rule 4). +2. `printer_extruder_variant` is that list **flattened** extruder-major, one entry per variant, and + `printer_extruder_id` gives each entry its 1-based extruder. These two size and address every + variant. Write all three keys and keep them in agreement. At load with + `single_extruder_multi_material` off, and in the app when the printer tab loads a printer with a + different number of extruders, the pair is rebuilt from `extruder_variant_list` (one + `Direct Drive Standard` per extruder when the list is absent) and the variant arrays are resized to + the rebuilt pair, padded with their first value or cut. The resize skips the `machine_max_*` limits + and `hotend_heating_rate` / `hotend_cooling_rate`: they keep their width, and an extruder beyond it + reads their first value, so extruder 2 and up of a list-less printer take extruder 1's normal limit + as their silent one too. With the three in agreement that changes nothing; a pair written without + the list is replaced. A listed variant the pair lacks is a menu choice that reads variant index 0. + - The pair without `extruder_variant_list` slices, but the sidebar offers no variant switch and + the app cannot add variants to a list-less process: nothing is lost while every extruder + has exactly one variant, and every further variant is unreachable. + - A missing or one-value `printer_extruder_id` is extruder 1 at every index + ([the id trap](#padding-truncation-and-composition)) unless the load-time rebuild above + replaces the pair (`single_extruder_multi_material` off). + - `check` reports against this rule ([variant arrays](validation.md#variant-arrays)). Errors: a + pair that is not the flattening, an id array that does not give each entry its extruder, a list + of more than one variant without the pair, and a pair without the list that puts several variants + on one extruder. A pair without the list and one variant per extruder is a warning where the + load-time rebuild would replace it (`single_extruder_multi_material` off, and a pair other than + one `Direct Drive Standard` per extruder), and passes otherwise. +3. Every variant string in an entry must start with that extruder's `extruder_type`. +4. `default_nozzle_volume_type` has one value per extruder and must name a nozzle volume type that + extruder's variants list; it seeds the sidebar. The live choice is `nozzle_volume_type` in the + project config, never a preset key. +5. Size every array by the set its key belongs to (the three sets are listed in full in + [The four key sets](#the-four-key-sets); the lengths are worked through in the + [sizing equation](#sizing-equation)): exactly the length below in each selectable preset that + writes it, or leave the key out and the preset takes what reaches it, the default or its base's + array. One value is no + shorthand for "the same for every variant"; write the value for every variant: + +| Set | Length | Keys | +| --- | --- | --- | +| `printer_extruder_options` | extruders (`E`) | the 8 per-extruder keys outside the variant scheme (`extruder_type`, `nozzle_diameter`, `default_nozzle_volume_type`, …) | +| `printer_options_with_variant_1` | variant length (`S`) | the full list below; not guessable from names | +| `printer_options_with_variant_2` | 2 × variant length | the 16 `machine_max_*` limits, at [stride 2](#widths): a (normal, silent) pair per variant | + +Put the variant layout on the shared base of all printers that share the hardware, and let the +nozzle-diameter siblings inherit it, restating only the variant arrays whose values change. `check` +does not judge a base on its own; its arrays count where they reach a selectable preset, under +`check --strict`. The loader stores a base at its **own** `printer_extruder_variant`, one variant +when it writes none whatever its extruder count, and cuts a wider array to its first values before +any child inherits it; so a multi-extruder base whose extruders need different values declares the +layout itself ([composition](#padding-truncation-and-composition)). When a variant array can move from +the presets to a base is in [shared-bases.md](shared-bases.md#variant-arrays-on-a-base). + +## Process + +1. `print_extruder_variant` + `print_extruder_id` list the (extruder id, variant string) pairs of the + process's variants. A variant is found by that pair, never by position: what is **required** is + that every pair a compatible printer (by list or condition) can select is present, in any order. A + missing pair reads the process's variant index 0 for that extruder, an extra pair is a variant + nothing selects, and neither is reported. The exception is a single-extruder printer whose + `extruder_variant_list` offers one variant string: no pair is matched there and variant index 0 + is read, so a process shared with such a printer lists that printer's pair first. **Mirroring** the printer's `printer_extruder_variant` + + `printer_extruder_id` entry for entry is the convention; follow it, so the arrays compare by eye, + but a different order with every pair present is a nit, not a defect. A process shared by printers + whose pairs differ falls back to variant index 0 on the pairs it lacks; give each layout its own base. +2. Every key in `print_options_with_variant` ([the full list](#the-four-key-sets), which is not + "every speed") has exactly one value per variant, or is left out. `print_extruder_id` needs its + value per variant too: one value pads to extruder 1 everywhere. `check` holds a + `print_extruder_id` that reaches the preset, written or inherited, to one entry per variant on any + printer, without `--strict`, and warns when it is absent and a variant repeats. +3. Only add process variants if speeds or accelerations really differ per nozzle volume type or + extruder. Otherwise omit the variant keys: a one-variant process needs no list, because match and + no-match both read variant index 0, and that variant is copied to every extruder at slice time. +4. Put the lists on the process base for that printer layout, so leaves stay small. + +## Filament + +```json +"filament_extruder_variant": ["Direct Drive Standard", "Direct Drive High Flow"], +"filament_max_volumetric_speed": ["21", "29"], +"filament_flow_ratio": ["0.98", "0.98"], +"filament_retraction_length": ["nil", "0.4"] +``` + +1. `filament_extruder_variant` lists variants **without extruder ids**: a filament's High Flow variant + is used on whichever extruder is in High Flow. Its entries must be distinct, since the lookup + returns the first equal string and a repeated entry is a variant nothing selects. There is no + filament id key: `filament_extruder_id` exists only as a G-code placeholder, not as a filament + option (its option and its set entry are commented out in `PrintConfig.cpp`), so a filament file that writes it loses the key as unknown. + `filament_extruder_compatibility` is unrelated to variants (it says which extruders the filament + may be loaded into). +2. Every key in `filament_options_with_variant` ([the full list](#the-four-key-sets)) that reaches the + preset, whether written, included or inherited, is resized to its variant count: write it at exactly + that width, or leave it out. Keys outside the set + (`filament_type`, plate temperatures, `fan_max_speed`, `slow_down_min_speed`, `pressure_advance`, + …) are never addressed by variant index; the preset contributes their first value however wide a + file writes them. +3. Cover every variant the material is meant to print on across its `compatible_printers`. Leave out + a variant deliberately when the material should not be tuned for it (e.g. a TPU High Flow variant + only on TPU filaments); an extruder reporting that variant string then reads the first variant. +4. Order the variants like the printer's, Standard first, so the first-variant fallback is the + conservative one. +5. Tune what really differs: `filament_max_volumetric_speed` is the usual difference between nozzle + volume types, then flow ratio, temperature and retraction. Use measured values; never copy the + Standard value into the High Flow variant and call it tuned. +6. `nil` is legal per variant in the nullable override keys, occupies one entry like any value, and + keeps the printer's value for that variant only. +7. Declare a multi-variant list with the arrays it sizes: on the filament, in its own file or in a + template it pulls in with [`include`](vendor-bundle.md#inherits-and-include). The filament may be + compatible with printers that list fewer variants, or none: each printer takes the filament's variant + for its own variant string, else the filament's first variant. A one-variant list on a shared base + is harmless, because one variant is the width a list-less preset has anyway; and a list-less base is + stored at that width, so a wider array on it reaches its children as its first value only. + A key such a base writes reaches a multi-variant child as one value, which the loader spreads over + the child's variants; `check --strict` reports it at the child, which restates it at its own width. + +## Widths + +Every variant key is a flat array addressed by **variant index**: index `n` belongs to entry `n` of +the preset's own variant list (`printer_extruder_variant`, `print_extruder_variant` or +`filament_extruder_variant`). The index is found by exact compare of the string +`" "` (plus the 1-based extruder id for printer and process lists), +and the value is read at `index × stride`: + +| Stride | Keys | Layout | +| --- | --- | --- | +| 1 | `printer_options_with_variant_1`, `print_options_with_variant`, `filament_options_with_variant` | `[variant 0, variant 1, …]` | +| 2 | `printer_options_with_variant_2` (the `machine_max_*` limits) | `[variant 0 normal, variant 0 silent, variant 1 normal, variant 1 silent, …]` | + +So a variant array is `variant length × stride` long. The **variant length** is the number of +entries in the preset's variant list, counted on the preset's config **after** `include` and +`inherits` are applied, dead variants included. An inherited array arrives already resized to the +base's own variant length, an included one at the width its file wrote +([composition](#padding-truncation-and-composition)): + +| Preset | Variant length | +| --- | --- | +| `machine` | `len(printer_extruder_variant)`; without it, the variants `extruder_variant_list` offers; without both, **one per extruder** (`len(nozzle_diameter)`), since the list's default is one `Direct Drive Standard` per extruder. `extruders_count` is a printer-tab field, not a preset key. The loader honours that default only halfway for a system preset: it sizes the composed preset by the one-entry default `printer_extruder_variant`, cutting every variant array to its first value, and only then (with `single_extruder_multi_material` off) rebuilds the pair to one variant per extruder ([Printer rule 2](#printer-machine)) and pads the arrays with that value. The rule's width is still one per extruder; to give extruders different values, declare the layout. | +| `process` | `len(print_extruder_variant)`; without one, 1 | +| `filament` | `len(filament_extruder_variant)`; without one, 1 | + +The per-extruder keys in `printer_extruder_options` ([listed with the sets](#the-four-key-sets)) are +outside this scheme and stay one value per extruder. Keys outside [the four sets](#the-four-key-sets) +are never variant-resized or addressed by variant index, however wide a shipped file writes them; a +per-extruder vector holds `len(nozzle_diameter)` values, and a shorter one acts as padded with its +first value ([machine-profiles.md](machine-profiles.md#multi-extruder-idex-and-tool-changers)). + +### Sizing equation + +For a key in one of the four variant sets: + +``` +E = extruders = len(nozzle_diameter) = len(extruder_type) + = len(default_nozzle_volume_type) = len(extruder_variant_list) +V_i = variants listed for extruder i = ","-separated entries of extruder_variant_list[i], + each " " +S = variant length = V_1 + V_2 + … + V_E + = len(printer_extruder_variant) = len(printer_extruder_id) +k = stride = 2 for printer_options_with_variant_2, else 1 + +N = values the key holds, one per variant: + machine (printer_options_with_variant_1, _2) = S × k + process (print_options_with_variant) = len(print_extruder_variant) = len(print_extruder_id) + filament (filament_options_with_variant) = len(filament_extruder_variant) +values[s × k + m] = variant index s, mode m (m = 0 normal, m = 1 silent; only m = 0 at stride 1) +variant index s = (printer_extruder_id[s], printer_extruder_variant[s]) +``` + +`printer_extruder_variant` is not sized by the equation; it defines `S`: it is `extruder_variant_list` +flattened extruder by extruder, and `printer_extruder_id[s]` is the extruder that index `s` came from. +A process that mirrors the printer's pairs, as [Process rule 1](#process) asks, has `N = S`; a +filament lists each variant string it is tuned for once, with no extruder id, so its `N` is its own +and independent of any one printer: it serves every printer in its `compatible_printers`, and a +variant string no extruder of a printer reports is simply never read there (a two-extruder printer +with `S = 7` serves a filament whose `N` is 3, and the filament keeps its 3 on a printer that offers +two variant strings). The +pair is what the loader reads, so the equality with the sum holds when the three keys agree, as +[Printer rule 2](#printer-machine) requires. + +A selectable preset that writes a variant key writes it at its own `N`; any other width, one value +included, is an error. A preset that leaves a key out takes what reaches it, the default or an array +it inherits or includes, which the loader resizes to the preset's `N`; `check --strict` holds that +array to the preset's `N` too. A base is not judged on its own: its arrays count only where they reach +a preset that does not override them. BBL is the model for strict: every printer-specific machine, +process and filament declares its layout and restates every variant key at its own `N`, even where all +the values are the same, keys Orca added to the sets included. +Without the lists, `extruder_variant_list` defaults to one +`Direct Drive Standard` per extruder, so a machine has `V_i = 1` and `S = E`, and a process or filament +has `N = 1`; the loader cuts a list-less machine to its first variant and, with +`single_extruder_multi_material` off, widens it again with that value ([variant length](#widths)). The per-extruder keys outside the sets +(`printer_extruder_options` plus `extruder_offset` and `extruder_colour`) and `extruder_variant_list` +itself hold `E` values. + +### Sizing examples + +**One extruder, two nozzle volume types**: `E = 1`, `V_1 = 2`, so `S = 2`; stride-1 keys hold 2 +values, `machine_max_*` hold 4: + +```json +"nozzle_diameter": ["0.4"], +"extruder_type": ["Direct Drive"], +"extruder_variant_list": ["Direct Drive Standard,Direct Drive High Flow"], +"printer_extruder_id": ["1", "1"], +"printer_extruder_variant": ["Direct Drive Standard", "Direct Drive High Flow"], +"default_nozzle_volume_type": ["Standard"], +"retraction_length": ["0.8", "1.0"], +"machine_max_speed_x": ["500", "200", "600", "250"] +``` + +The matching process lists the same two pairs (`print_extruder_id` `["1", "1"]`, +`print_extruder_variant` as above) and holds 2 values per key, e.g. `outer_wall_speed` +`["200", "260"]`; a filament for it lists `["Direct Drive Standard", "Direct Drive High Flow"]` and +holds 2 values per key, e.g. `filament_max_volumetric_speed` `["16", "24"]`. + +**Four extruders, one nozzle volume type each** (a tool changer): `E = 4`, every `V_i = 1`, so +`S = 4`; stride-1 keys hold 4 values, `machine_max_*` hold 8: + +```json +"nozzle_diameter": ["0.4", "0.4", "0.6", "0.4"], +"extruder_type": ["Direct Drive", "Direct Drive", "Direct Drive", "Direct Drive"], +"extruder_variant_list": ["Direct Drive Standard", "Direct Drive Standard", + "Direct Drive Standard", "Direct Drive Standard"], +"printer_extruder_id": ["1", "2", "3", "4"], +"printer_extruder_variant": ["Direct Drive Standard", "Direct Drive Standard", + "Direct Drive Standard", "Direct Drive Standard"], +"default_nozzle_volume_type": ["Standard", "Standard", "Standard", "Standard"], +"retraction_length": ["0.8", "0.8", "1.2", "0.8"], +"machine_max_speed_x": ["500", "200", "500", "200", "500", "200", "500", "200"] +``` + +The (normal, silent) pair is repeated per extruder: `["500", "200"]` would be width 2 against +`S × k = 8` (the loader pads it to `500, 200, 500, 500, …`) and `["500"]` width 1; both are errors. The +process mirrors the four pairs (`print_extruder_id` `["1", "2", "3", "4"]`) with 4 values per key, or +omits the variant keys altogether when nothing differs per extruder (then one value per key). A +filament for it lists only `["Direct Drive Standard"]`: one entry, so one value per key. Drop the +layout from this printer and the widths stay the same, since the default list gives `S = E = 4`; but +the loader then keeps only the first variant ([variant length](#widths)): `retraction_length` +becomes `0.8` on every extruder and extruder 3 loses its `1.2`. + +### Adding a variant inserts its values at its variant index + +Indexes run extruder-major: extruder 1's variants in `extruder_variant_list` order, then extruder +2's. A new variant's values go in at its index, not at the end. Giving extruder 1 of a two-extruder +printer a High Flow option, when only extruder 2 had one: + +| Key | Before | After | +| --- | --- | --- | +| `extruder_variant_list` | `["Direct Drive Standard", "Direct Drive Standard,Direct Drive High Flow"]` | `["Direct Drive Standard,Direct Drive High Flow", "Direct Drive Standard,Direct Drive High Flow"]` | +| `printer_extruder_id` | `["1", "2", "2"]` | `["1", "1", "2", "2"]` | +| `printer_extruder_variant` | `[Standard, Standard, High Flow]` | `[Standard, High Flow, Standard, High Flow]` (full strings in the file) | +| `retraction_length` (stride 1) | `["0.8", "1.0", "1.2"]` | `["0.8", "?", "1.0", "1.2"]`: one value at index 1 | +| `machine_max_speed_x` (stride 2) | `["500", "200", "600", "250", "700", "300"]` | `["500", "200", "?", "?", "600", "250", "700", "300"]`: a (normal, silent) pair at position 2 | +| `print_extruder_id` / `print_extruder_variant` / `outer_wall_speed` | mirror the printer | the same insertion at index 1 | +| `filament_extruder_variant` `[Standard, High Flow]` | — | unchanged: filament variants carry no extruder id, so the existing High Flow variant now serves both extruders | + +Every `?` is a measured value for that nozzle, on the machine limits as much as on retraction. +Removing or renaming a variant shifts the later values the same way in reverse; a variant string that +no longer matches the enum is simply a variant nothing selects. + +### Padding, truncation and composition + +**Every key in the set widens, whether or not a file restates it.** At load each variant key of the +composed config is resized to the length of the preset's own `*_extruder_variant` (the one-entry +default when it writes none) × stride: a short array is **padded by repeating its first value**, a +long one is truncated to its first values, without a word from the loader or the validator. The rule +does not follow from this padding: a file writes a variant key at **exactly `variant length × stride`** +or not at all. Any other length, one value included (which the loader spreads over every variant, at +stride 2 over normal *and* silent alike), is a mistake the loader hides and +`orca_profile_tool.py check` reports as an error in the selectable preset that writes it, even when +every value is the same; `check --strict` also reports an array that reaches a selectable preset at +another width +([variant arrays](validation.md#variant-arrays)). + +The loader sizes a list-less preset of any type to one variant at this step, a list-less machine +included: a two-extruder machine without a layout that writes `retraction_length` `["0.8", "0.9"]`, the +width the equation asks for, stores `["0.8"]`, which the pair rebuild and the slice-time collapse hand +to both extruders. A 3-value array on a preset of variant length 2 keeps its first two; at length 4 it +becomes `[a, b, c, a]`. + +Composition hands down widths in two ways: + +- **`inherits` hands down the parent's resized arrays.** A base is stored after its own resize, at + the length of its own `*_extruder_variant` (one variant for a base of any type that writes none, + whatever its extruder count), so an array wider than the base's list is cut to its first values + before any child sees it, and a child that adds variants gets those first values padded. Widen an + array only on a preset whose own resolved list already has the entries. `check` judges selectable + presets only, at the width each file wrote: an array a base's own resize cuts is not seen (a review + item), and an inherited array of another width than a child's list is left to the loader's resize + unless `check --strict`, which asks the child to restate it at its own width. +- **`include` hands down the template's diff at its pre-resize width.** The template contributes every + key where its composed config differs from the built-in defaults, taken before its own resize, so the + arrays it writes arrive at the width its file wrote, and the includer's own list sizes them. A key the + template sets to the built-in default is not passed on + ([`include`](vendor-bundle.md#inherits-and-include)). + +The id keys are the trap in this padding: `printer_extruder_id` and `print_extruder_id` are members +with default `[1]`, so a missing or one-value id array beside a longer variant list is padded to +extruder 1 at every index. That is right on a single-extruder printer and wrong on a multi-extruder +one, where every variant is then addressed as extruder 1's. A machine escapes it only where the +load-time pair rebuild of [Printer rule 2](#printer-machine) runs (`single_extruder_multi_material` +off); a process's `print_extruder_id` is never rebuilt at load. `check` +holds an id array that reaches a selectable preset, written or inherited, to one entry per variant on +any printer; `fix-variant` never pads an id array or a variant list, since those address the +variants rather than fill them. + +Consequences: + +- A base that gains a variant silently pads every descendant that restates a variant array at the old + width, and a short `machine_max_*` array copies variant 0's *normal* limit into the silent entries + too; a descendant that restates nothing inherits the widened array and needs no edit. Extend, in one + change: the printer base and each nozzle-diameter sibling that restates a variant array, the process + bases that mirror the printer's variants, and the filaments that should cover the variant. +- A one-value override is reported, and the loader spreads it over **all** variants, overwriting the + ones that should differ. +- A process or filament that omits the new variant is not padded; the variant resolves to its index 0. + +### Slice time and existing users + +**Slice time collapses variants to extruders.** When printer, process and filaments are combined on a +printer with several extruders or several variant strings, each printer and process variant key is +re-gathered to one entry per extruder (× stride) in extruder order, using each extruder's live nozzle +volume type, or to one entry per nozzle volume type for an extruder that holds several (Hybrid, or +`extruder_nozzle_stats` listing more types than there are extruders); on any other printer they are +not re-gathered and variant index 0 is read. Filament keys are re-gathered to one entry per filament, +on a printer with a single variant too once a filament has several variants, and under a dynamic +nozzle map to one entry per variant each filament prints through. Custom G-code and the +`machine_max_*` limits therefore index by extruder or filament, never by variant index; variant order +matters only inside the preset. An extruder with no matching variant reads variant index 0, extruder +1's first variant, whichever extruder it is; under layered nozzle grouping, `get_config_index_base` +reads the collapsed arrays and falls back to the same extruder's first entry instead. + +**Existing user presets and projects follow the variant string, not the position.** A user preset +stores every variant array it changed (nullable keys as per-variant diffs, `nil` where equal to the +parent). On load each parent variant takes the child's value for the variant with the same extruder id +and variant string; variants the parent gained keep the parent's value, and a child whose arrays the +parent cannot map keeps its own. Per-object process overrides are remapped when a printer change +alters the extruder count or the length of `printer_extruder_variant`, by variant string alone (no +extruder id; of several matching values the smallest wins), and a single-value override applies to +every variant. Adding or reordering variants in a shipped preset is therefore safe for existing +users; renaming a variant, or moving it to another extruder id, loses their values for it. + +**A new nozzle volume type changes no array.** Adding one to the code widens nothing until a profile +lists the new variant string; until then every existing array keeps its length and meaning. + +## The four key sets + +Membership is literal (four `std::set` initializers in `src/libslic3r/PrintConfig.cpp`) +and **not guessable from names**: `ironing_speed`, `skirt_speed`, `wipe_speed`, `scarf_joint_speed`, +`small_support_perimeter_speed` and `wipe_tower_max_purge_speed` are process speeds outside the set, +while every process `*_acceleration` and `*_jerk` key is inside, and so are +`small_perimeter_threshold`, `top_solid_infill_flow_ratio` and `slowdown_for_curled_perimeters`; +`filament_flush_temp` is in and `filament_flush_temp_fast` out; `use_firmware_retraction` is out and +`travel_slope` and `retract_lift_enforce` in. The three variant-list keys and the two id +keys are members of their own set (the list sizes itself, a no-op; the id keys are padded like any +other member, [the id trap](#padding-truncation-and-composition)), while `extruder_variant_list` is in +no set: the variant-length resize leaves it alone, and only the pair rebuild of +[Printer rule 2](#printer-machine) pads it. The per-extruder `printer_extruder_options` is listed +last for contrast; it is not a variant set. + +`check` and `fix-variant` read the four sets from `PrintConfig.cpp` on every run, so they follow the +engine. The lists below are from the 2026-09-25 checkout; regenerate them from the repository root +before relying on them (the recipe strips comments, since an initializer can carry a commented-out entry): + +```bash +python3 - <<'EOF' +import re +src = open('src/libslic3r/PrintConfig.cpp', encoding='utf-8', errors='replace').read() +for name in ['printer_options_with_variant_1', 'printer_options_with_variant_2', + 'print_options_with_variant', 'filament_options_with_variant', + 'printer_extruder_options']: + body = re.search(r'std::set\s+' + name + r'\s*=\s*\{(.*?)\};', src, re.S).group(1) + body = re.sub(r'/\*.*?\*/', '', body, flags=re.S) + body = re.sub(r'//[^\n]*', '', body) + print(name, sorted(set(re.findall(r'"([^"]+)"', body)))) +EOF +``` + +**`printer_options_with_variant_1`**, machine, stride 1 (27): `deretraction_speed`, `hotend_cooling_rate`, `hotend_heating_rate`, `long_retractions_when_cut`, `nozzle_flush_dataset`, `nozzle_type`, `nozzle_volume`, `printer_extruder_id`, `printer_extruder_variant`, `retract_after_wipe`, `retract_before_wipe`, `retract_length_toolchange`, `retract_lift_above`, `retract_lift_below`, `retract_lift_enforce`, `retract_restart_extra`, `retract_restart_extra_toolchange`, `retract_when_changing_layer`, `retraction_distances_when_cut`, `retraction_length`, `retraction_minimum_travel`, `retraction_speed`, `travel_slope`, `wipe`, `wipe_distance`, `z_hop`, `z_hop_types` + +**`printer_options_with_variant_2`**, machine, stride 2 (16): `machine_max_acceleration_e`, `machine_max_acceleration_extruding`, `machine_max_acceleration_retracting`, `machine_max_acceleration_travel`, `machine_max_acceleration_x`, `machine_max_acceleration_y`, `machine_max_acceleration_z`, `machine_max_jerk_e`, `machine_max_jerk_x`, `machine_max_jerk_y`, `machine_max_jerk_z`, `machine_max_junction_deviation`, `machine_max_speed_e`, `machine_max_speed_x`, `machine_max_speed_y`, `machine_max_speed_z` + +**`print_options_with_variant`**, process, stride 1 (45): `bridge_acceleration`, `bridge_speed`, `default_acceleration`, `default_jerk`, `default_junction_deviation`, `enable_overhang_speed`, `gap_infill_speed`, `infill_jerk`, `initial_layer_acceleration`, `initial_layer_infill_speed`, `initial_layer_jerk`, `initial_layer_speed`, `initial_layer_travel_acceleration`, `initial_layer_travel_jerk`, `initial_layer_travel_speed`, `inner_wall_acceleration`, `inner_wall_jerk`, `inner_wall_speed`, `internal_bridge_speed`, `internal_solid_infill_acceleration`, `internal_solid_infill_speed`, `outer_wall_acceleration`, `outer_wall_jerk`, `outer_wall_speed`, `overhang_1_4_speed`, `overhang_2_4_speed`, `overhang_3_4_speed`, `overhang_4_4_speed`, `print_extruder_id`, `print_extruder_variant`, `slowdown_for_curled_perimeters`, `small_perimeter_speed`, `small_perimeter_threshold`, `sparse_infill_acceleration`, `sparse_infill_speed`, `support_interface_speed`, `support_speed`, `top_solid_infill_flow_ratio`, `top_surface_acceleration`, `top_surface_jerk`, `top_surface_speed`, `travel_acceleration`, `travel_jerk`, `travel_speed`, `travel_speed_z` + +**`filament_options_with_variant`**, filament, stride 1 (48): `activate_air_filtration`, `activate_air_filtration_during_print`, `activate_air_filtration_on_completion`, `complete_print_exhaust_fan_speed`, `during_print_exhaust_fan_speed`, `filament_adaptive_volumetric_speed`, `filament_cooling_before_tower`, `filament_deretraction_speed`, `filament_extruder_variant`, `filament_flow_ratio`, `filament_flush_temp`, `filament_flush_volumetric_speed`, `filament_ironing_flow`, `filament_ironing_inset`, `filament_ironing_spacing`, `filament_ironing_speed`, `filament_long_retractions_when_cut`, `filament_max_volumetric_speed`, `filament_pre_cooling_temperature`, `filament_pre_cooling_temperature_nc`, `filament_preheat_temperature_delta`, `filament_ramming_travel_time`, `filament_ramming_travel_time_nc`, `filament_ramming_volumetric_speed`, `filament_ramming_volumetric_speed_nc`, `filament_retract_after_wipe`, `filament_retract_before_wipe`, `filament_retract_length_nc`, `filament_retract_length_toolchange`, `filament_retract_lift_above`, `filament_retract_lift_below`, `filament_retract_lift_enforce`, `filament_retract_restart_extra`, `filament_retract_restart_extra_toolchange`, `filament_retract_when_changing_layer`, `filament_retraction_distances_when_cut`, `filament_retraction_length`, `filament_retraction_minimum_travel`, `filament_retraction_speed`, `filament_wipe`, `filament_wipe_distance`, `filament_z_hop`, `filament_z_hop_types`, `long_retractions_when_ec`, `nozzle_temperature`, `nozzle_temperature_initial_layer`, `retraction_distances_when_ec`, `volumetric_speed_coefficients` + +**`printer_extruder_options`**, machine, one value per extruder, not a variant set (8): +`default_nozzle_volume_type`, `extruder_max_nozzle_count`, `extruder_printable_area`, +`extruder_printable_height`, `extruder_type`, `max_layer_height`, `min_layer_height`, +`nozzle_diameter`. These are never addressed by variant index; `extruder_offset`, `extruder_colour` and +`extruder_variant_list` are per extruder too. A shorter array acts as padded with its first value, and +entries beyond the extruder count are never read +([per-extruder vectors](machine-profiles.md#multi-extruder-idex-and-tool-changers)). + +## Checking and testing + +Checklist for a new variant profile set: + +1. Decide the variants per extruder from the real hardware; pick legal strings only. +2. Printer base: `extruder_type`, `extruder_variant_list`, flattened `printer_extruder_variant` + + `printer_extruder_id`, `default_nozzle_volume_type`; every variant array at variant length, every + `machine_max_*` at 2 × variant length as (normal, silent) pairs, even where the values are the + same, values in variant order. +3. A process base per variant layout, or no variant keys at all. +4. Filaments for the printer: a variant list covering the intended variants, every variant key at that + width, measured values per nozzle volume type. +5. Run the usual authoring commands and full checks. `check` holds each array of steps 2–4 to the + width of the selectable preset that writes it, `check --strict` also to every selectable preset it + reaches, and + the printer's layout keys through every selectable preset + ([variant arrays](validation.md#variant-arrays)); `check_variant_names` holds every variant string, + `extruder_type`, `nozzle_volume_type` and `default_nozzle_volume_type` to the enums + ([variant names](validation.md#variant-names)). The choice of variants, the variant order and + the measured values are not checked. +6. In the app, for each nozzle volume type in the sidebar combo: slice and confirm the G-code uses that + variant's values (e.g. volumetric speed limit, retraction). `validate_slice` only slices the default + nozzle volume type. + +To review rather than author, run the same list against the diff. `check` catches a wrong array length, +a layout key out of step, and a variant string the enums cannot build. The failures no check catches: a +new variant appended instead of inserted at its index, an array widened on a base whose list is +shorter (cut before any child inherits it), a process lacking a pair its printer can select, and a High +Flow variant copied from Standard. + +### UI facts to design around + +- The single-extruder sidebar shows a **nozzle volume type combo** (tooltip `Flow`, in place of the + nozzle-diameter selector) only when `extruder_variant_list` offers more than one distinct variant + string (`support_different_extruders`); four extruders listing `Direct Drive Standard` each show + none. +- The two-extruder sidebar's per-extruder nozzle volume type combos are shown for BBL printers only. + Another vendor's multi-extruder printer falls back to the single-extruder layout: one combo (for the + first extruder) when the variants differ, otherwise the nozzle-diameter selector, so the other + extruders' nozzle volume type stays at `default_nozzle_volume_type`. +- High Flow is hidden from the combo when `printer_variant` is `0.2` or the printer model is + `Bambu Lab X1E`, and E3D High Flow unless `printer_variant` is `0.4` or `0.6`. A variant listed on + another nozzle diameter is never selectable there. +- The filament tab shows a variant switch built from the filament's own `filament_extruder_variant`; + a multi-variant filament whose tab shows none did not resolve its variant list through `include` or + `inherits`. The printer and process tabs show one entry per extruder instead, labelled with that + extruder's live nozzle volume type (two for Hybrid), and only on two-extruder printers whose + `extruder_variant_list` offers more than one variant string; elsewhere they edit the variant of the + nozzle volume type selected in the sidebar (an X1C shows no switch). + +### Worked examples in the tree + +`BBL/machine/fdm_bbl_3dp_001_common.json` (one extruder), `fdm_bbl_3dp_002_common.json` (two +extruders), `Bambu Lab X1 Carbon 0.4 nozzle.json` (Standard + High Flow), `Bambu Lab H2D 0.4 +nozzle.json` (extruders with different variant sets), `Bambu Lab X2D 0.4 nozzle.json` (Direct Drive + +Bowden), with their `@BBL` processes and filaments. The H2D and X2D examples also carry +`E3D High Flow` variants. BBL's multi-variant filament lists come from `fdm_filament_template_*` +presets that the printer-specific filaments pull in with `include`, not from their `inherits` chain. diff --git a/.claude/skills/orca-profiles/references/filament-profiles.md b/.claude/skills/orca-profiles/references/filament-profiles.md index 873e2a6510..bc80176eaa 100644 --- a/.claude/skills/orca-profiles/references/filament-profiles.md +++ b/.claude/skills/orca-profiles/references/filament-profiles.md @@ -1,8 +1,8 @@ # Filament profiles and OrcaFilamentLibrary -`OrcaFilamentLibrary` is the filament-only bundle the loader reads **first**; its config map -becomes the base bundle, so any vendor may inherit a library preset by name. It is the only cross-bundle -parent — vendor-to-vendor inheritance always fails. +`OrcaFilamentLibrary` is the filament-only bundle the loader reads **first**, so any vendor's filament may +inherit a library preset by name. It is the only cross-bundle parent: vendor-to-vendor inheritance +always fails. ## Where a filament goes @@ -10,63 +10,65 @@ parent — vendor-to-vendor inheritance always fails. | --- | --- | | Generic material for all printers | `OrcaFilamentLibrary/filament/Generic @System.json` | | A brand's product, all printers | `OrcaFilamentLibrary/filament//` | -| A brand's tune for one printer | `OrcaFilamentLibrary/filament///` — recommended; `/filament//` also works | -| A printer vendor's tune of a generic or its own product | `/filament/` | +| A brand's tune for one printer vendor | `OrcaFilamentLibrary/filament///` (recommended); `/filament//` also works | +| A printer vendor's tune of a generic, or its own product | `/filament/` | -Both locations for the last-but-one row are supported: `OrcaFilamentLibrary/filament///.json` +Both locations in the third row are supported: `OrcaFilamentLibrary/filament///.json` (the shape the wiki shows) and `/filament//`. The library path is the one a -filament vendor should contribute to — `OrcaFilamentLibrary/filament//` is the brand's own -folder, while a printer vendor's folder belongs to that printer vendor. Brand tunes do ship under -printer vendors' folders today (Polymaker and SUNLU among others). +filament brand should contribute to: `OrcaFilamentLibrary/filament//` is the brand's own folder, +while a printer vendor's folder belongs to that printer vendor. -Library layout: `filament/base/fdm_filament_*.json` type roots, root-level `Generic @System.json` -generics, and one subfolder per brand, which may nest printer-specific tunes one level deeper. Adding -a brand means adding a folder here; the folder name is a directory label only — `filament_vendor` inside the JSON is the real vendor string. +Library layout: `filament/base/fdm_filament_*.json` material roots, root-level +`Generic @System.json` generics, and one subfolder per brand, which may nest printer-specific +tunes one level deeper. Adding a brand means adding a folder here; the folder name is a directory label +only, and `filament_vendor` inside the JSON is the real vendor string. ## The three-part shape ```jsonc -// Fiberon PA6-CF @base.json — the product root, holds identity + material values +// OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json — the product root: identity + material values { "type": "filament", "name": "Fiberon PA6-CF @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pa", - "filament_id": "OFkOviHk", // generated here; variants inherit it + "filament_id": "OFkOviHk", // minted here by generate-id; every child inherits it "filament_vendor": ["Polymaker"], "filament_type": ["PA6-CF"], /* … */ } -// Fiberon PA6-CF @System.json — the selectable shim, 7 keys +// OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @System.json — the selectable all-printer shim, 7 keys { "type": "filament", "name": "Fiberon PA6-CF @System", "from": "system", "instantiation": "true", "inherits": "Fiberon PA6-CF @base", "setting_id": "…", "compatible_printers": [] } -// /filament/Polymaker/Fiberon PA6-CF @BBL X1C.json — a printer tune -{ … "inherits": "Fiberon PA6-CF @base", "filament_max_volumetric_speed": ["14"], +// BBL/filament/Polymaker/Fiberon PA6-CF @BBL X1C.json — a printer tune (BBL keeps its own copy of the @base) +{ …, "inherits": "Fiberon PA6-CF @base", "filament_max_volumetric_speed": ["14"], "compatible_printers": ["Bambu Lab X1 Carbon 0.4 nozzle", …] } ``` -- `@base` is the convention for a root. A base carries **no** `setting_id`, no `compatible_printers`, no - `filament_settings_id`. Only the `setting_id` half is enforced, and nothing violates it; the other two - are unchecked and plenty of bases still carry them. Do not copy that from a neighbouring file. -- Every `@System` must be `"instantiation": "true"`. DREMC ships `@System` presets set to `"false"`, - which therefore ship but can never be selected; no check catches it. -- A duplicated brand `@base` across bundles is normal and intentional (`Fiberon PA6-CF @base` exists in - both the library and BBL with the same id, differing only in MVS) — bases never enter the preset - collection, so there is no duplicate-name error. -- You may inherit from an instantiated preset as well as from a base; it is common. +- `@base` is the convention for a root; a root is really `instantiation: "false"`. A base carries + **no** `setting_id`, no `compatible_printers` and no `filament_settings_id`. Only the `setting_id` + half is enforced; the other two are unchecked, so a neighbouring base that carries them is no model. +- Every `@System` shim must be `"instantiation": "true"`; one set to `"false"` would ship but could + never be selected, and no check catches it. The shim exists only for products in the library. +- `filament_cost`, `filament_density`, `filament_type` and `filament_vendor` belong on the root and + should not appear in a printer tune. +- A brand `@base` duplicated across bundles is legal (a vendor bundle may keep its own copy of a + library product root, with the same id): bases never become selectable presets and the + duplicate-name error covers only those, so there is none. +- You may inherit from an instantiated preset as well as from a base. -## Color is a runtime property +## Colour is a runtime property -`filament_id` identifies a product, not a color; filament sync/AMS reads the color from the spool at -runtime. A product ships one all-printer preset and the color is chosen at runtime — never a sibling -preset that differs only by color. A material family (PLA vs PLA Matte vs PLA Silk) is a new product; a -color is not. A printer tune keeps the product alias and does not multiply per color either. +`filament_id` identifies a product, not a colour; filament sync and AMS read the colour from the spool +at runtime. A product ships one all-printer preset and the colour is chosen at runtime, never a sibling +preset that differs only by colour. A material family (PLA vs PLA Matte vs PLA Silk) is a new product; +a colour is not. A printer tune keeps the product alias and does not multiply per colour either. -CI does not catch this — per-color presets pass `check` — so it is a review call. +CI does not catch this (per-colour presets pass `check`), so it is a review call. ## The two most common contributions -**A printer vendor tuning a generic.** Keep the `Generic X` base name so the alias shadows the library -preset on your printers, inherit `Generic X @System`, declare **no** `filament_id` (inheriting the -library's is correct — the product really is the library's generic), and give it a non-empty -`compatible_printers` in its own body: +**A printer vendor tuning a generic.** Keep the `Generic X` alias so it shadows the library preset on +your printers, inherit `Generic X @System`, declare **no** `filament_id` (inheriting the library's is +correct: the product really is the library's generic), and give it a non-empty `compatible_printers` in +its own file: ```jsonc // /filament/Generic PETG @Acme One 0.4 nozzle.json @@ -76,13 +78,14 @@ library's is correct — the product really is the library's generic), and give "compatible_printers": ["Acme One 0.4 nozzle"] } ``` -**A printer vendor's own branded product.** Give it a `@base` root so `generate-id` can mint the id (see -[ids.md](ids.md) — inheriting `Generic X @System` directly makes the id unfixable by the tool), then one -instantiated leaf per printer in the same bundle. No `@System` shim: that is only for a product entering -OrcaFilamentLibrary. +**A printer vendor's own branded product.** Give it a `@base` root on a material base so `generate-id` +can mint the id, then one instantiated leaf per printer in the same bundle. Inheriting +`Generic X @System` directly gives the product the generic's id, which the tool cannot fix +([ids.md](ids.md#what-generate-id-does-and-does-not-fix)). No `@System` shim: that is only for a product +entering OrcaFilamentLibrary. ```jsonc -// /filament/Acme Aura PETG @base.json — instantiation false, no setting_id +// /filament/Acme Aura PETG @base.json — instantiation false, no setting_id { "type": "filament", "name": "Acme Aura PETG @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pet", "filament_vendor": ["Acme"], "filament_type": ["PETG"] } // filament_id minted here @@ -94,174 +97,190 @@ OrcaFilamentLibrary. "compatible_printers": ["Acme One 0.4 nozzle"] } ``` -Omit `filament_settings_id` from new presets — it is runtime bookkeeping the app rewrites to the preset +Omit `filament_settings_id` from new presets: it is runtime bookkeeping the app rewrites to the preset name. +To offer either kind by default, add its name to each model's `default_materials`; put it first in the +machine's `default_filament_profile` only if it should be the preselected filament +([machine keys](machine-profiles.md#other-keys)). + ## `compatible_printers` -- **Library fallbacks:** empty `[]` or absent, so they are offered on all printers except where - [alias shadowing](#alias-shadowing) supplies a printer-specific tune. -- **Library printer-specific tunes:** non-empty, listing exact printer **variant** names. These can +- **Library fallbacks** (`@System`): empty `[]` or absent, so they are offered on all printers except + where [alias shadowing](#alias-shadowing) supplies a printer-specific tune. +- **Library printer-specific tunes**: non-empty, listing exact printer **variant** names. These supersede a same-alias fallback just like a tune in a printer vendor's bundle. -- **Instantiated filaments in every other vendor:** non-empty, listing exact printer **variant** names. - Enforced twice but not identically: the C++ `has_errors` reads the *flattened* config, so an inherited list satisfies it, - while the Python check reads the file's **own** key. Write the list in the file itself. This is the - most common filament CI failure. -- Emptying it to "make it apply everywhere" fails that check *and* creates a duplicate-`filament_id` - collision against the library generic on every printer. -- Copying a base's full printer list onto a nozzle-specific variant produces duplicate combobox entries — - a real shipped bug twice over. +- **Instantiated filaments in every other vendor**: non-empty, listing exact printer **variant** names. + Enforced twice, but not identically: `validate_system` reads the resolved config, so an inherited list + satisfies it, while `check` reads the file's **own** key. Write the list in the file itself. This is + the most common filament CI failure. +- Emptying it to "make it apply everywhere" fails that check *and* collides with the library generic's + `filament_id` on every printer. +- Copying a base's full printer list onto a nozzle-specific tune produces duplicate combobox entries: a + real shipped bug twice over. ## Overlapping coverage: one variant, one profile per product -`filament_id` is the **product** key, not the preset key — every variant of one product shares it -(`//`). So if one printer variant appears in the -`compatible_printers` of two presets of that product, the slicer cannot tell them apart at AMS match time. -The C++ validator reports `Ambiguous AMS filament match: N presets share filament_id "X" … printer "Y"`. -`orca_profile_tool.py check` does **not** see it and passes. Resolve the overlap by **specificity**: keep -the variant on the most specific profile and remove it from every more general one. Deleting a profile is -the least preferred fix — moving coverage keeps the tune that users rely on. +`filament_id` is the **product** key, not the preset key: every preset of one product shares it +(`//`). So if one printer variant appears in the +`compatible_printers` of two presets of that product, the slicer cannot tell them apart at AMS match +time. `validate_system` reports `Ambiguous AMS filament match: N filament presets share filament_id "X" +and are all compatible with printer "Y"`; `orca_profile_tool.py check` does **not** see it and passes. +Resolve the overlap by **specificity**: keep the variant on the most specific profile and remove it from +every more general one. Deleting a profile is the least preferred fix: moving coverage keeps the tune +that users rely on. -Judge specificity from the profile's `compatible_printers` — how many variants it actually covers — and -use the name only as a secondary, easily-vague hint; decide by the lists, with a best judgement call on -the name. Naming conventions differ by vendor: BBL's is the reference (`@ ` for a whole +Judge specificity from the profile's `compatible_printers` (how many variants it actually covers) and +use the name only as a secondary, often vague hint; decide by the lists, with a judgement call on the +name. Naming conventions differ by vendor: BBL's is the reference (`@ ` for a whole model, `@ nozzle` for one variant, `@` for a vendor-wide generic), but others vary (`@`, a printer serial, or Creality's `@-all`). A name never overrides -the list — see [preset naming](naming.md) for the shapes. +the list; see [preset naming](naming.md#filament) for the shapes. Specificity, most to least: -1. **Variant-specialized** — lists a single printer variant (BBL-style - `... @ nozzle`). -2. **Model-specialized** — lists the variants of one printer model (BBL-style `... @ `). - It should cover every variant of its model, not only the nozzle it was authored for. -3. **Family / series** — lists variants spanning a printer family or series. -4. **Generic / catch-all** — vendor-wide, covering many unrelated models (often the bare +1. **Variant-specialized**: lists a single printer variant (BBL-style + `… @ nozzle`). +2. **Model-specialized**: lists the variants of one printer model (BBL-style `… @ `). It + should cover every variant of its model, not only the nozzle it was authored for. +3. **Family / series**: lists variants spanning a printer family or series. +4. **Generic / catch-all**: vendor-wide, covering many unrelated models (often the bare `Generic @`). Rules: - A model-specialized profile is extended to **all** variants of its model, and each variant it thereby - starts covering is removed from the family and generic profiles that also listed it — including variants - that had no overlap before. Apply it per nozzle, not just 0.4. + starts covering is removed from the family and generic profiles that also listed it, including + variants that had no overlap before. Apply it per nozzle, not just 0.4. - Apply it **per product**: trim only the material that has a specialized profile from the generic; a material whose product has no specialized profile keeps the variant in the generic. - Never strip coverage a variant has nowhere else to get. If a variant has no variant-level specialized - profile, the next level down keeps it; when the model has specialized profiles, the model-level one wins - over the family/generic. -- Moving coverage is preferred over deleting. If a profile must be deleted, remove the more general - one, not the specialized profile that carries the tune. -- After moving coverage, repoint the affected `default_filament_profile` (machine) and clean the model's - `default_materials`: they should name the most specific profile that covers the variant, and should not - keep generic entries that no longer cover the model. This rule applies equally when adding or fixing - defaults. + profile, the next level down keeps it; when the model has specialized profiles, the model-level one + wins over the family and generic ones. +- Moving coverage is preferred over deleting. If a profile must be deleted, remove the more general one, + not the specialized profile that carries the tune. +- After moving coverage, repoint the affected machine's `default_filament_profile` and clean the model's + `default_materials`: they should name the most specific profile that covers the variant, and should + not keep generic entries that no longer cover the model. This rule applies equally when adding or + fixing defaults. -Multiple profiles of one product with **disjoint** `compatible_printers` is the intended end state. +Several profiles of one product with **disjoint** `compatible_printers` is the intended end state. Adding coverage to the specialized profile and removing it from the generic is the preferred direction. -**Detection caveat:** `orca_profile_tool.py check` is blind to this; only the C++ validator behind the full -`./scripts/check_profile.sh` reports it (`validate_system`). Always confirm with that, not the vendor-scoped -loop. +**Detection caveat:** `orca_profile_tool.py check` is blind to this; only the validator behind the full +`./scripts/check_profile.sh` reports it (`validate_system`). Always confirm with that, not the +vendor-scoped loop. ## Alias shadowing -A printer-specific filament in either the library or a vendor bundle supersedes the library fallback -on the printers it lists. The matching key is the **alias**: the preset name up to the **first** `@`, -right-trimmed (no `@` → the whole name). So -`QIDI ABS-GF@Q2-Series` aliases to `QIDI ABS-GF`. +A printer-specific filament in either the library or a vendor bundle supersedes the library fallback on +the printers it lists. The matching key is the **alias**: the preset name up to the **first** `@`, +right-trimmed (no `@` → the whole name). So `QIDI ABS-GF@Q2-Series` aliases to `QIDI ABS-GF`. -A library preset with an empty `compatible_printers` collects, into `m_excluded_from`, every printer named -by any same-alias preset that *has* a non-empty list, and is then hidden on those printers. +A library preset with an empty `compatible_printers` is hidden on every printer that a same-alias preset +lists in a non-empty `compatible_printers`, whether that preset is in the library or in a vendor bundle +(a printer matches by its own name or its parent's). Two consequences: -- **Only an unrestricted library fallback can be shadowed.** Two printer-specific presets sharing - an alias do not exclude each other — overlapping lists for the same product trip the - duplicate-`filament_id` check instead. -- This is why adding `Generic PLA @` to a vendor silently removes the library `Generic PLA` - from that printer. Intended — and the reason a vendor tuning a generic must **keep the `Generic X` - base name**. +- **Only an unrestricted library fallback can be shadowed.** Two printer-specific presets sharing an + alias do not hide each other; overlapping lists for the same product trip the ambiguous-match error + above instead. +- This is why adding `Generic PLA @` to a vendor silently removes the library + `Generic PLA @System` from that printer. That is intended, and the reason a vendor tuning a generic + must **keep the `Generic X` alias**. -The literal spelling `Generic @System` is load-bearing beyond shadowing: `find_preset2` rewrites an -unresolved name containing "Generic" into that form and retries against the library, which is how 3MF -and project recovery works. +The literal spelling `Generic @System` is load-bearing beyond shadowing: when a user preset, an +imported preset or a 3MF project names a parent that no longer resolves and contains `Generic`, the +loader rewrites the name into `Generic @System` and retries. Only the library ships those names, +so keep them. ## `filament_id`, `filament_vendor`, `filament_type` -`filament_id` is minted from the triple `(filament_vendor, filament_type, name-before-first-@)`. -`filament_vendor` and `filament_type` are therefore **identity, not decoration** — editing either -re-mints the id. Read `docs/HLSD/filament_id.md` before changing any of them, and see -[ids.md](ids.md) for the tooling. +`filament_id` is minted from the triple `(filament_vendor, filament_type, alias)`. `filament_vendor` and +`filament_type` are therefore **identity, not decoration**: editing either, or the alias, re-mints the +id. Read `docs/HLSD/filament_id.md` before changing any of them, and see [ids.md](ids.md) for the +tooling. -A filament with no resolvable `filament_id` anywhere in its `inherits` chain is a **hard load error** that -discards the vendor bundle. The id inherits across bundles, so a vendor's `Generic ABS @X` inheriting -`Generic ABS @System` gets the library's id for free; a vendor's own product must resolve its own. +A filament with no resolvable `filament_id` anywhere in its `inherits` chain is a **hard load error** +that discards the vendor bundle. The id inherits across bundles, so a vendor's `Generic ABS @X` +inheriting `Generic ABS @System` gets the library's id for free; a vendor's own product must resolve its +own. -- `filament_type` **must be a JSON array** — the one vector key the Python check enforces. A scalar - `"PP"` once hung the filament/printer selection UI. +- `filament_type` **must be a JSON array**: the one vector key `check` rejects as a scalar outright. A + scalar `"PP"` once hung the filament and printer selection UI. - It is an **open** enum: an unlisted value is accepted silently and falls back to 190–300 °C defaults - and adhesion 1.0. Off-list values do ship. Prefer a value from `MaterialType::all()` in + and adhesion 1.0. Prefer a value from `MaterialType::all()` in `src/libslic3r/MaterialType.cpp`, or add a row there. - Generics use `filament_vendor: ["Generic"]`, which `fdm_filament_common` already defaults to. ## `"nil"` -Legal in any key whose `ConfigOptionDef` is `nullable`. In a filament preset that is most of the -`filament_*` family, plus `long_retractions_when_ec` and `retraction_distances_when_ec`. About half are -the extruder overrides (`filament_retraction_length`, `filament_z_hop`, `filament_wipe`, -`filament_retract_*`, `filament_retraction_speed`, `filament_deretraction_speed`, -`filament_retraction_minimum_travel`, `filament_wipe_distance`, `filament_long_retractions_when_cut`, -`filament_retraction_distances_when_cut`, …), where `nil` means *keep the printer/extruder's own value*. -The rest are ordinary nullable options (`filament_flow_ratio`, `filament_flush_temp`, -`filament_adaptive_volumetric_speed`, …) where it means *unset*. +`"nil"` is legal only in an option defined as nullable (`add_nullable`, or `nullable = true`, in +`src/libslic3r/PrintConfig.cpp`). Anywhere else it fails the file, and with it the **whole bundle** +(`Failed loading configuration file`, after `Deserializing nil into a non-nullable object` or +`Invalid value provided for parameter : nil`). To leave a non-nullable key unset, omit it; do not +write `nil`. -Anywhere else it throws `Deserializing nil into a non-nullable object`. To not set a non-nullable key, -omit it — do not write `nil`. +In filament presets a minority of the `filament_*` keys are nullable, plus `long_retractions_when_ec` +and `retraction_distances_when_ec`. About half of them are the extruder overrides (`filament_retraction_length`, +`filament_z_hop`, `filament_wipe`, `filament_retract_*`, `filament_retraction_speed`, +`filament_deretraction_speed`, `filament_retraction_minimum_travel`, `filament_wipe_distance`, +`filament_long_retractions_when_cut`, `filament_retraction_distances_when_cut`, …), where `nil` means +*keep the printer's or extruder's own value*. The rest are ordinary nullable options +(`filament_flow_ratio`, `filament_flush_temp`, `filament_adaptive_volumetric_speed`, …), where it means +*unset*. Check the option's definition before writing `nil` anywhere else. -## What to review per nozzle +## Tuning per nozzle and per variant -Across `@X` / `@X 0.N nozzle` sibling pairs the keys that differ, most often first, are +Between a product's `@X` and `@X 0.N nozzle` tunes the keys that usually differ, most often first, are `filament_max_volumetric_speed`, `filament_retraction_length`, `slow_down_min_speed`, -`filament_flow_ratio`, `slow_down_layer_time`, `nozzle_temperature` and `pressure_advance`. -`filament_cost`, `filament_density`, `filament_type` and `filament_vendor` belong on the `@base` and -should not appear in a printer tune. +`filament_flow_ratio`, `slow_down_layer_time`, `nozzle_temperature` and `pressure_advance` (switched on +by `enable_pressure_advance`). Use measured values for the material, hotend, extruder and nozzle combination. Neither maximum -volumetric speed nor pressure advance has a universal nozzle-only lookup table. When cloning a -0.4 preset for a 0.2 nozzle, explicitly revisit flow limits; do not infer a pressure-advance value -or a required direction of change from diameter alone. +volumetric speed nor pressure advance has a universal nozzle-only lookup table. When cloning a 0.4 +preset for a 0.2 nozzle, explicitly revisit flow limits; do not infer a pressure-advance value, or a +required direction of change, from diameter alone. -## Style - -Overrides, not full copies: a typical instantiated filament preset carries around a dozen non-meta keys, -and a library leaf two or three. Presets that restate fifty-plus keys from their parent do still ship — -Phrozen's single filament preset is that style — but they are the pattern to move away from, not to -copy. Commit `6943b6ddc3` is the stated model (flip true bases to `instantiation: "false"`, strip -`compatible_printers`/`setting_id`/`filament_settings_id`, add `renamed_from` on the survivor). - -Prefer the library's `fdm_filament_*` bases over a vendor-local copy. Phrozen's local -`fdm_filament_common` has drifted from the library's. - -Canonical key order, written by `orca_profile_tool.py normalize` when it rewrites a file: `type`, `name`, -`renamed_from`, `inherits`, `from`, `setting_id`, `filament_id`, `instantiation`, then everything else in -the order you wrote it. Not enforced — a file that leads with `compatible_printers` passes `check`. - -**Every vector-typed (`co*s`) key must be a JSON array.** Only `filament_type` is an outright error, but -`normalize` silently arrayifies five more (`filament_cost`, `filament_density`, -`temperature_vitrification`, `filament_max_volumetric_speed`, `filament_vendor`) and `check` fails when -it would. Every other vector key is on you — including `filament_start_gcode`, `filament_end_gcode`, -`filament_extruder_variant`, `compatible_printers` and the plate temperatures. +On a printer with extruder variants, a filament tunes these per variant too: +`filament_max_volumetric_speed`, `filament_flow_ratio`, `nozzle_temperature` and the retraction +overrides carry one value per variant of `filament_extruder_variant` (Standard, High Flow, …). The +exact key set is [`filament_options_with_variant`](extruder-variants.md#the-four-key-sets); +`slow_down_min_speed` and `pressure_advance` are not in it. Keep every such array at exactly that width, even where the +setting does not differ per variant, and measure the High Flow variant rather than copying Standard +([extruder-variants.md](extruder-variants.md#filament)). ## Bed temperature is twelve keys, not one -There is no single "bed temperature". Which plate key applies depends on `curr_bed_type`, whose six -selectable values (`btPC`, `btEP`, `btPEI`, `btPTE`, `btPCT`, `btSuperTack`; `btDefault` maps to no key) -`get_bed_temp_key()` turns into `cool_plate_temp`, `eng_plate_temp`, `hot_plate_temp`, -`textured_plate_temp`, `textured_cool_plate_temp` and `supertack_plate_temp` — each with an -`*_initial_layer` twin. +There is no single "bed temperature". The plate type selected for the printer (`Cool Plate`, +`Engineering Plate`, `High Temp Plate`, `Textured PEI Plate`, `Textured Cool Plate`, `Supertack Plate`) +picks one of six keys, each with an `_initial_layer` twin: `cool_plate_temp`, `eng_plate_temp`, +`hot_plate_temp`, `textured_plate_temp`, `textured_cool_plate_temp` and `supertack_plate_temp`. -`textured_cool_plate_temp` is the one most often forgotten. A printer with `support_multi_bed_types` off -hides the selector, and the printer preset's -`default_bed_type` decides which plate is selected for it, but `curr_bed_type` can still hold a stale -value carried over from another printer — so set every plate the printer plausibly has, as the sibling -presets in the bundle do. +`textured_cool_plate_temp` is the one most often forgotten. A non-BBL printer with +`support_multi_bed_types` off hides the plate selector and uses the printer preset's `default_bed_type` +(High Temp Plate, `hot_plate_temp`, when unset or invalid), but a loaded project or a CLI config can +still carry another plate. So set every plate the printer plausibly has, as the sibling presets in the +bundle do. + +## Style + +- Overrides, not full copies: an instantiated filament preset carries around a dozen non-meta keys, + and a library `@System` shim two or three. A preset that restates fifty-plus keys from its parent is + the pattern to move away from, not to copy. Commit `6943b6ddc3` is the stated model for converting such presets: flip true + bases to `instantiation: "false"`, strip their `compatible_printers`, `setting_id` and + `filament_settings_id`, and add `renamed_from` on the surviving selectable preset. A value every + printer tune of a product shares goes on the product's `@base` + ([shared bases](shared-bases.md#levels)). +- Prefer the library's `fdm_filament_*` bases over a vendor-local copy; for a new preset, even in a + bundle whose older presets use one: a local copy drifts from the library's. +- Canonical key order, written by `orca_profile_tool.py normalize` when it rewrites a file: `type`, + `name`, `renamed_from`, `inherits`, `from`, `setting_id`, `filament_id`, `instantiation`, then + everything else in the order you wrote it. Not enforced on its own: a file that leads with + `compatible_printers` passes `check`. +- **Every vector-typed (`co…s`) key must be a JSON array.** Only a scalar `filament_type` is an outright + error; `normalize` silently arrayifies five more (`filament_cost`, `filament_density`, + `temperature_vitrification`, `filament_max_volumetric_speed`, `filament_vendor`), and `check` fails + when it would. Every other vector key is on you, including `filament_start_gcode`, + `filament_end_gcode`, `filament_extruder_variant`, `compatible_printers` and the plate temperatures. diff --git a/.claude/skills/orca-profiles/references/ids.md b/.claude/skills/orca-profiles/references/ids.md index b6a09e9a2f..214a3d719c 100644 --- a/.claude/skills/orca-profiles/references/ids.md +++ b/.claude/skills/orca-profiles/references/ids.md @@ -1,76 +1,78 @@ # `setting_id` and `filament_id` Orca-generated ids are deterministic hashes of identity. **Never invent an id or copy a sibling's -`setting_id`.** Use `scripts/orca_profile_tool.py`; the two special cases are +`setting_id`.** +Use `scripts/orca_profile_tool.py`; the two special cases are [a wrongly inherited filament id](#what-generate-id-does-and-does-not-fix) and [BBL's authoritative setting ids](#bbls-exception-precisely). -`docs/HLSD/filament_id.md` is the authoritative design document for `filament_id` — the id landscape, the -checks CI runs, and the Bambu catalog map. This page is the tooling half. +`docs/HLSD/filament_id.md` is the authoritative design document for `filament_id`: the id landscape, +the checks CI runs, and the Bambu catalog map. This page is the tooling half. | | `setting_id` | `filament_id` | | --- | --- | --- | | Identifies | one selectable preset | one filament **product** | -| Key hashed | `//` | `filament_product///` | -| Shape | 16 base62 chars | `OF` + 6 base62 chars | +| Key hashed | `//` | `filament_product///`, using the resolved (inherited) first values and the name up to the first `@`, right-trimmed | +| Shape | 16 base62 characters | `OF` + 6 base62 characters | | Required on | every `instantiation: "true"` preset | every **instantiated** filament, own or inherited | -| Forbidden on | bases (`instantiation != "true"`) | — (a base is exactly where it belongs) | -| Scope | globally unique across the tree | shared by every variant of the product, in every bundle | +| Forbidden on | bases (`instantiation` not `"true"`) | — (a product's root base is exactly where it belongs) | +| Scope | unique across the whole tree | shared by every preset of the product, in every bundle | -`` is `machine` / `process` / `filament` — the vendor is the **folder** name (`BBL`), not the -display name (`Bambulab`). Renaming a preset changes its `setting_id`; renaming a filament, or editing -its `filament_vendor` or `filament_type`, also changes its `filament_id`. +`` is `machine`, `process` or `filament`, and the vendor is the **folder** name (`BBL`), not the +display name (`Bambulab`). Renaming a preset changes its `setting_id`; renaming a filament's alias, or +editing its `filament_vendor` or `filament_type`, also changes its `filament_id`, and the old id is not +forwarded. ## The tool -Use `scripts/orca_profile_tool.py` with a subcommand: +`scripts/orca_profile_tool.py` takes a subcommand: | Command | Does | | --- | --- | -| `check` | everything CI's `profile_tool` step runs — see [validation.md](validation.md) | +| `check` | everything CI's `profile_tool` step runs; see [validation.md](validation.md#orca_profile_toolpy-check) | | `generate-id` | writes `setting_id` and `filament_id` | | `normalize` | rewrites profile files into their canonical shape | -| `trim` | deletes profile files no `.json` list references | +| `trim` | deletes profile files no `.json` list references | | `update-index` | rebuilds the `*_list` sections from the files on disk | -The order after adding, renaming or deleting files — each step feeds the next, so it is not -interchangeable — is `normalize` → `update-index` → `generate-id` → `check`. -The [authoring workflow](../SKILL.md#creating-or-modifying-a-profile) has the commands. +The order after adding, renaming or deleting files is `normalize` → `update-index` → `generate-id` → +`check`. Each step feeds the next, so it is not interchangeable. The +[authoring workflow](../SKILL.md#creating-or-modifying-a-profile) has the commands. -> **`trim` deletes.** It removes every profile file the index does not list — including the one you just -> added and have not registered yet. Register first, or skip `trim` entirely; it is a cleanup sweep, not +> **`trim` deletes.** It removes every profile file the index does not list, including the one you just +> added and have not registered yet. Register first, or skip `trim` entirely: it is a cleanup sweep, not > part of landing a profile. Preview with `--dry-run`. **Register, then mint.** The `filament_id` pass reads `.json`'s `filament_list`, not the filesystem (the `setting_id` pass walks the filesystem, so a bundle whose index has not landed yet is -still assignable). A new filament file is therefore invisible to `generate-id`'s filament_id pass until -it is registered — its `setting_id` is written regardless. +still assignable). A new filament file is therefore invisible to `generate-id`'s `filament_id` pass +until it is registered; its `setting_id` is written regardless. -- `--dry-run` works on every writing command (`generate-id`, `normalize`, `trim`, `update-index`) - and writes nothing. -- `--filament-id` / `--setting-id` narrow `generate-id`; they exclude each other, and passing neither - writes both. -- `--vendor` is repeatable and narrows **only what is written** — the id is a function of the triple +- `--dry-run` works on every writing command (`generate-id`, `normalize`, `trim`, `update-index`) and + writes nothing. +- `--filament-id` / `--setting-id` narrow `generate-id` to one pass; they exclude each other, and + passing neither writes both. +- `--vendor` is repeatable and narrows **only what is written**: an id is a function of its own key alone, so a narrowed run writes exactly what a full run would. An unknown vendor exits 1 before any write. `--vendor` on `check` narrows the per-vendor checks only; the `setting_id` and `filament_id` passes stay tree-wide. -- `--profiles DIR` points any command at another tree — see +- `--profiles DIR` points any command at another tree; see [Checking a copy of the tree](validation.md#checking-a-copy-of-the-tree). - `--profile-type` narrows `normalize`, `trim` and `update-index` to `machine_model`, `process`, `filament` or `machine`. - Exit codes: 0 clean, 1 errors found (`generate-id` still writes what it could), 2 argparse misuse. - Output is ANSI-coloured; searching for the literal `[ERROR]` still works. -`generate-id` is **idempotent and byte-preserving** — BOM and CRLF kept, one key line touched per pass. -A legitimate `generate-id` diff is one or two changed lines per file: a new instantiated filament gets -both a `filament_id` and a `setting_id`, and a BBL file with a misspelled `settings_id` has that line -dropped and its value restored under the right key. `normalize` is the opposite by design — it rewrites -whole files into canonical shape — which is why `check` demands it already be a no-op. Some bundles have -CRLF committed (OrcaFilamentLibrary, Anycubic and RH3D among them), so a `normalize` pass there rewrites -every line — read the diff before committing it. +`generate-id` is **idempotent and byte-preserving**: BOM and CRLF are kept, and each pass touches only +its one key line. A legitimate `generate-id` diff is one or two changed lines per file: a new instantiated +filament gets both a `filament_id` and a `setting_id`. `normalize` is the opposite by design (it +rewrites whole files into canonical shape), which is why `check` demands it already be a no-op. A file +committed with CRLF line endings changes on every line under `normalize`; read the diff before +committing it. -On a clean tree `check` and `generate-id --dry-run` both exit 0 with zero findings. That is the -baseline to restore before opening a PR. +Exit 1 from `generate-id` does not mean nothing was written: it writes every id it can and reports the +rest, so read the diff before rerunning. On a clean tree `check` and `generate-id --dry-run` both exit 0 +with zero findings; that is the baseline to restore before opening a PR. ## What `generate-id` does and does not fix @@ -78,35 +80,37 @@ Writes: - a `setting_id` into any instantiated preset that lacks one, or whose value does not match the formula; - strips a `setting_id` from a base; -- deletes the misspelled `settings_id` key; +- deletes the misspelled key `settings_id`, moving its value to `setting_id` only on an instantiated BBL + preset that lacks one (everywhere else the old value is discarded and a fresh id minted); - a `filament_id` into the id-less **root(s)** of an instantiated filament that resolves none; - rewrites a **declared** `filament_id` that is not the mint of its own triple. Refuses to write (reports only): a base62 collision between two products, an empty `filament_vendor` or -`filament_type`, a broken `inherits` chain, roots of one filament resolving divergent `(vendor, type)` -pairs. +`filament_type`, a broken `inherits` chain, and roots of one filament resolving different +`(filament_vendor, filament_type)` pairs. -**Does not fix: a preset that *inherits* a wrong `filament_id`.** This is check 2b, and it is the trap -most likely to bite. It happens when a branded filament inherits a generic for its settings: +**Does not fix: a preset that *inherits* a wrong `filament_id`.** This is check 2b (the label `docs/HLSD/filament_id.md` and the tool use), and it is the trap most likely to bite. +It happens when a branded filament inherits a generic for its settings: ```jsonc { "name": "Phrozen Aura PETG @Phrozen Arco 0.4 nozzle", - "inherits": "Generic PETG @System" } // resolves the OFL generic's id — wrong product + "inherits": "Generic PETG @System" } // resolves the library generic's id: wrong product ``` -The preset resolves *an* id, so `generate-id` neither inserts nor rewrites, and `check` fails with +The preset resolves *an* id, so `generate-id` neither inserts nor rewrites one, and `check` fails with `inherits filament_id "X" but its own triple "V/T/N" mints "Y"`. Two fixes, in order of preference: 1. **Give the product a `@base` root** inheriting a material base (`fdm_filament_pet`, - `fdm_filament_pla`, …). No `fdm_filament_*` base carries a `filament_id`, so the filament now resolves - none and `generate-id` mints it for you. This is also the shape the rest of the tree uses. -2. **Declare the tool-computed key on the preset itself.** Use the expected value reported by `check` - or compute it with the function below; this is not a manually chosen id. Make sure the preset - resolves the right `filament_vendor` and `filament_type` first — with - neither set, the triple resolves through the generic parent and the branded product is minted - under vendor `Generic`. If you need the id before the file exists: + `fdm_filament_pla`, …) with its own `filament_vendor` and `filament_type`. No `fdm_filament_*` base + carries a `filament_id`, so the filament now resolves none and `generate-id` mints it on the root. + This is the product-root shape ([the three-part shape](filament-profiles.md#the-three-part-shape)). +2. **Declare the tool-computed id on the preset itself.** Use the expected value `check` reports, or + compute it with the function below; this is not a manually chosen id. First make sure the preset + resolves the right `filament_vendor` and `filament_type`: with neither set, the triple resolves + through the generic parent and the branded product is minted under vendor `Generic`. If you need the + id before the file exists: ```bash python3 -c "import sys; sys.path.insert(0,'scripts'); from orca_profile_tool import generate_filament_id as g; print(g('Polymaker','PLA','PolyLite PLA'))" @@ -114,36 +118,39 @@ Two fixes, in order of preference: ``` The quoting works unchanged in cmd and PowerShell; only swap `python3` for `py -3`. + `generate_preset_setting_id('', '', '')` is the `setting_id` equivalent. - The `setting_id` equivalent is `generate_preset_setting_id('', '', '')`. +A vendor's tune of a generic that keeps the `Generic X` alias is not this case: inheriting the +generic's id is correct there, because the product really is the library generic +([filament-profiles.md](filament-profiles.md#the-two-most-common-contributions)). ## BBL's exception, precisely -`RESERVED_VENDORS = {"BBL"}` covers **`setting_id` assignment only**, keyed on the *folder* name: +The exception covers **`setting_id` assignment only**, keyed on the *folder* name `BBL`: -- The tool never mints or replaces a BBL `setting_id`. A new instantiated BBL preset with no - `setting_id` therefore **cannot be fixed by the tool**, yet the presence rule still applies to it — - carry over Bambu's authoritative id by hand. +- The tool never mints or replaces a `setting_id` in `BBL/`: those are Bambu's own ids. A new + instantiated BBL preset with no `setting_id` therefore **cannot be fixed by the tool**, yet the + presence rule still applies to it: carry over Bambu's authoritative id by hand. - BBL is not exempt from anything else: bases still get their `setting_id` stripped, ids must still be - globally unique, and BBL `filament_id`s are minted like everyone else's — every one of them is an - `OF*`. + unique across the tree, and BBL `filament_id`s are minted like everyone else's, as `OF…` ids. ## Ids other systems compose -No id from another system is the mint of a triple, so `check` rejects it like any other bad id — same -error, same remedy, whoever wrote it. Three such spaces exist near the tree; recognise them so you do -not copy one into a profile: +No id from another system is the mint of a triple, so `check` rejects one used as a `filament_id` like +any other bad id: same error, same remedy, whoever wrote it. Three such spaces exist near the tree; +recognise them so you do not copy one into a profile: -- **Bambu's `GF*` catalog** — external and opaque, correlated to Orca's ids by the generated - `resources/printers/bambu_filament_ids.json`. `GF` is a *prefix*, not a spelling the tree avoids: most - BBL `setting_id`s start with `G`, and `blacklist.json` and - `BBL/filament/filaments_color_codes.json` both reference Bambu catalog ids by design. The rule is - about `filament_id` and nothing else. -- **Qidi's `QD_*`** — composed at runtime by the box (`QD___`), not a preset id. -- **`P` + 7 hex, and `"null"`** — what `CreatePresetsDialog.cpp` gives a *user*-created filament. +- **Bambu's `GF…` catalog**: external and opaque, correlated to Orca's ids by the generated + `resources/printers/bambu_filament_ids.json`. `blacklist.json` and + `BBL/filament/filaments_color_codes.json` reference Bambu catalog ids by design. The rule is about + `filament_id` and nothing else: every BBL `setting_id` starts with `G`, and that is Bambu's own + preset id, not a leaked catalog id. +- **Qidi's `QD_…`**: composed at runtime by the printer's filament box + (`QD___`), not a preset id. +- **`P` + 7 hex digits, and `"null"`**: what the app gives a *user*-created filament. ## Tests -`python3 -m unittest discover -s scripts/tests -t scripts` (`py -3 -m …` on Windows). Note the -`-t scripts` argument; without it the imports fail. CI runs them as the first, non-`continue-on-error` -step of the profile job — see [validation.md](validation.md#ci). +`python3 -m unittest discover -s scripts/tests -t scripts` (`py -3 -m …` on Windows) runs the tool's +unit tests. Note the `-t scripts` argument; without it the imports fail. CI runs them as the first, +non-`continue-on-error` step of the profile job; see [validation.md](validation.md#ci). diff --git a/.claude/skills/orca-profiles/references/machine-profiles.md b/.claude/skills/orca-profiles/references/machine-profiles.md index 01071af6b1..de338f14ee 100644 --- a/.claude/skills/orca-profiles/references/machine-profiles.md +++ b/.claude/skills/orca-profiles/references/machine-profiles.md @@ -1,23 +1,23 @@ # Printer models and variants -Both live in `resources/profiles//machine/*.json`; models go in `machine_model_list`, variants -and shared bases in `machine_list`. Every one of them is registered. Some vendors (Elegoo, Eryone, -InfiMech, FlyingBear) nest a further subfolder under `machine/`, so recurse rather than globbing -`machine/*.json`. +Both live in `resources/profiles//machine/`; models go in `machine_model_list`, variants and +shared bases in `machine_list`. Every one of them is registered. A bundle may nest further subfolders +under `machine/`, so recurse rather than globbing `machine/*.json`. -## A `machine_model` is not a config preset +## `machine_model`: a record, not a config preset -It is parsed by a hand-written key switch, and only these keys are stored (`version` and `url` are -matched and discarded): +The loader reads a fixed set of keys from a `machine_model` and stores only these (`version` and `url` +are recognised and discarded): `name`, `model_id`, `nozzle_diameter`, `machine_tech`, `family`, `bed_model`, `bed_texture`, `hotend_model`, `default_materials`, `not_support_bed_type`, `image_bed_type`, `bottom_texture_end_name`, `bottom_texture_rect`, `bottom_texture_rect_longer`, `middle_texture_rect`, `use_double_extruder_default_texture`. -**Everything else is silently dropped.** Only `name` and `nozzle_diameter` are required. Dead keys ship -on real models today — `url`, `default_bed_type`, even a `desciption` typo — so a neighbour carrying a -key is no evidence it does anything. Printer config options belong on the `machine` preset, never here. +**Everything else is silently dropped**, a printer config key such as `default_bed_type` or a +misspelling included, so a neighbour carrying a key is no evidence it does anything. Printer config options belong on the `machine` preset, never here. The loader drops a model +silently if its index entry has no name or its `nozzle_diameter` yields no sizes; `check` also requires +the file's own `name`. ```json { @@ -36,28 +36,28 @@ key is no evidence it does anything. Printer config options belong on the `machi | Field | Notes | | --- | --- | -| identity | **the `name` of the `machine_model_list` entry**, which is what a variant's `printer_model` must equal. `check_name_consistency` forces it to equal the file's `name`, so they coincide. | -| `model_id` | a *separate* cloud/device printer type. Optional, and not required to be unique. Not the model's identity. Changing it changes device matching. | -| `machine_tech` | only `starts_with("SL")` means SLA; everything else is FFF. Write `FFF`; a few models write `FGF`, which is a label with no effect. | -| `nozzle_diameter` | `;`-separated string, one token per available size. Order is free (Qidi writes `0.4;0.2;0.6;0.8` to put the default first). This list is the authoritative set of legal `printer_variant` values. | -| `default_materials` | `;`-separated filament **preset names**. Used to preselect in the wizard *and* by `PresetBundle::load_installed_filaments` to auto-install a printer's filaments on first run, so a dangling entry costs a real user a filament. Not `,`; case-sensitive (`@System`). `check` fails on a dangling name here or in `default_filament_profile`. | +| identity | **the `name` of the `machine_model_list` entry**, which is what a variant's `printer_model` must equal. `check` forces it to equal the file's `name`, so they coincide. | +| `model_id` | a *separate* cloud/device printer type. Optional, and not required to be unique. Not the model's identity; changing it changes device matching. | +| `machine_tech` | only a value starting with `SL` means SLA; everything else is FFF. Write `FFF`; `FGF` behaves as FFF. | +| `nozzle_diameter` | `;`-separated string, one token per available size. Order is free (`0.4;0.2;0.6;0.8` puts the default first). This list is the authoritative set of legal `printer_variant` values. | +| `default_materials` | `;`-separated filament **preset names**, not `,`; case-sensitive (`@System`); order is ignored. Used to preselect filaments in the setup wizard *and* to install a printer's filaments on first run, so a dangling entry costs a real user a filament. Every name must exist (`check` fails on a name matching no filament file, here or in `default_filament_profile`), and every variant of the model needs at least one entry compatible with it (`validate_system`). | | `family` | a wizard grouping label only; give every model one. | ### Assets -`bed_model`, `bed_texture` and `hotend_model` are paths relative to the **vendor folder** (by id). -Majority convention: `_buildplate_model.stl` and `_buildplate_texture.svg`. An empty string -is the legal "none", and is the norm for `hotend_model`. +`bed_model`, `bed_texture` and `hotend_model` are paths relative to the **vendor folder** (named by the +vendor id). Convention: `_buildplate_model.stl` and `_buildplate_texture.svg`. An +empty string is the legal "none", and is the norm for `hotend_model`. -**Nothing checks that the file exists.** A missing `hotend_model` falls back to -`resources/profiles/hotend.stl`; a missing `bed_model`/`bed_texture` just renders nothing. Broken -references already ship. Verify by hand. +**Nothing checks that the files exist.** A missing `hotend_model` falls back to +`resources/profiles/hotend.stl`; a missing `bed_model` makes the bed render as a generic custom bed, and a missing +`bed_texture` renders no texture. +Verify by hand, in exact case. -Every model also has a `_cover.png` in the vendor folder — treat it as required, not optional. -240×240 is the cap `scripts/optimize_cover_images.py` enforces and the size most covers already use. -A missing cover degrades to a placeholder in both the wizard and the sidebar. +Every model also has a `_cover.png` in the vendor folder; treat it as required, not optional. +240×240 is the cap `scripts/optimize_cover_images.py` enforces. A missing cover degrades to a placeholder in both the wizard and the sidebar. -## The `machine` variant +## `machine`: the variant ```json { @@ -79,116 +79,154 @@ A missing cover degrades to a placeholder in both the wizard and the sidebar. Minimum viable key set: `type`, `name`, `from`, `instantiation`, `setting_id`, `inherits`, `printer_model`, `printer_variant`, `nozzle_diameter`, `printable_area`, `printable_height`, -`default_print_profile`. The four keys without which the preset will not load at all are `name`, -`instantiation`, `printer_model` and `printer_variant`; `default_filament_profile` is an array -(`["Generic PLA @System"]`) and the model's `default_materials` a `;`-separated string. Unlike a -`machine_model`, a `machine` **is** config-loaded, so a key belonging to another preset type is a -reported error (a misspelled key is still silent). +`default_print_profile`. `default_filament_profile` is optional; when written it +is an array (`["Generic PLA @System"]`), while the model's `default_materials` is a `;`-separated +string. Unlike a `machine_model`, a `machine` **is** a config preset, so a key belonging to another +preset type is a reported error and is removed; a misspelled key is still dropped silently. -### `printer_variant` — three hard rules +### `printer_model` and `printer_variant` -1. Non-empty, and an exact member of the model's `;`-separated `nozzle_diameter` list. -2. `printer_model` non-empty and naming a model of this vendor. -3. In validation mode, for instantiated presets only: split `printer_variant` on `+`, each token must - start with a number (a trailing non-numeric suffix such as `HF` is ignored), and the resulting **set** - must equal `set(nozzle_diameter)`. +1. `printer_model` is non-empty and names a model of this bundle exactly. +2. `printer_variant` is non-empty and an exact token of that model's `;`-separated `nozzle_diameter` + list. +3. For instantiated presets, when validating: split `printer_variant` on `+`; each token must start + with a number (a trailing non-numeric suffix such as `HF` is ignored), and the resulting **set** must + equal the set of `nozzle_diameter` values. -Rules 1 and 2 are loader-enforced — failing either drops the preset *and* the whole bundle. Rule 3 only -raises a validation error: the preset still loads, but the validator exits non-zero. +Rules 1 and 2 are loader-enforced: failing either discards the whole bundle. Rule 3 only raises a +validation error: the preset still loads, but the validator exits non-zero. -`nozzle_diameter` lists one entry **per physical nozzle**; `printer_variant` lists the **distinct** -diameters joined with `+`. Snapmaker U1 is the worked case: `["0.4","0.4","0.6","0.6"]` against -`"0.4+0.6"` — it passes because the comparison is on sets. +`nozzle_diameter` lists one entry **per extruder**; `printer_variant` lists the **distinct** diameters +joined with `+`: `["0.4","0.4","0.6","0.6"]` against `"0.4+0.6"` passes because the comparison is on +sets. -The conventional values are `0.2`, `0.25`, `0.4`, `0.5`, `0.6`, `0.8` and `1.0`. Suffixed forms -(`0.4HF`, `0.6HF`, `0.8HF`, `0.4HS`) are Flashforge-only and the `+` form is rare. A variant is **not** -required to be unique within a model — Volumic ships `EXO42 IDRE`, `… COPY MODE` and `… MIRROR MODE` all -at `0.4` under the one model `EXO42 IDRE`. +Write `printer_variant` as a bare diameter matching the model's list, with no unit. The conventional +values are `0.2`, `0.25`, `0.4`, `0.5`, `0.6`, `0.8` and `1.0`; a suffixed form (`0.4HF`, `0.4HS`) or +the `+` form is legal under rule 3. A `printer_variant` is **not** required to be unique within a +model: an IDEX model's normal, `COPY MODE` and `MIRROR MODE` presets can all be `0.4`. The converse is **unchecked**: a nozzle size in the model's list with no matching variant is offered in -the wizard and resolves to nothing. `Wanhao France`'s `D12 500 PRO M2 DIRECT` ships that bug today. +the wizard and resolves to nothing. A variant whose `printer_model` names a sibling model by mistake +leaves its own model's size in exactly that state. -### Other fields worth knowing +### Other keys -- `default_print_profile` is a **scalar**, matched by exact preset name. Not a `;` list. The named +- `default_print_profile` is a **scalar**, matched by exact preset name; not a `;` list. The named process must be compatible with this printer through its resolved list or condition. `validate_slice` attempts to select it and rejects generic Default fallbacks, but compatibility - updates can choose another compatible preset. Check the exact default reference yourself. -- `default_filament_profile` is an **array**, one name per element. -- `printable_area` is an array of `"XxY"` strings — four points for a rectangle, one per segment for a - delta or circular bed. -- `gcode_flavor` is usually set once in the base; `klipper`, `marlin`, `marlin2` and `reprapfirmware` - cover nearly every shipped printer. -- `printer_settings_id` is junk — most files carrying it disagree with their own name. Do not copy it - when cloning a bundle. -- `min_layer_height` / `max_layer_height` are **machine** keys (per extruder), never process keys. + updates can choose another compatible preset, and `check` does not resolve the name. Check the exact + default reference yourself. +- `default_filament_profile` is an **array**, one name per element. Entry 0 is the filament preselected + when the printer is chosen; entry *i* is the preferred replacement when filament *i* is incompatible, + and any listed name outranks an unlisted one. The validator checks every entry. The list of a + printer's filaments is the model's `default_materials`: a new filament goes into `default_materials`; + put it first in `default_filament_profile` only if it should become the preselected one. +- `printable_area` is an array of `"XxY"` strings: four points for a rectangle; a delta or other circular bed + is a polygon with one point per segment. +- A non-BBL printer shows the plate selector only with `support_multi_bed_types` `"1"`; otherwise it + uses its `default_bed_type` (a plate name such as `"Textured PEI Plate"`; High Temp Plate when unset). + Filaments still set every plate + ([twelve keys](filament-profiles.md#bed-temperature-is-twelve-keys-not-one)). +- `gcode_flavor` is usually set once in the base; the common values are `klipper`, `marlin`, `marlin2` + and `reprapfirmware`. +- `printer_settings_id` does nothing in a preset file: the app replaces it with the selected preset's + name before slicing. Omit it, and do not copy it when cloning a bundle. +- `min_layer_height` / `max_layer_height` are **machine** keys (one per extruder), never process keys. ## Bases -Nearly every machine-bearing vendor registers a base literally named `fdm_machine_common`, and Klipper -vendors add `fdm_klipper_common` on top of it. Two levels is the usual depth. +The conventional machine root is a base named `fdm_machine_common`, with `fdm_klipper_common` on top +of it for Klipper printers. Which values a hardware +family or model base holds, and when adding one pays off, is in [shared-bases.md](shared-bases.md). **There is no leading-underscore convention for bases.** ## Adding a printer to an existing bundle -1. Choose the names first — model, variant(s), process(es); everything else references them. +1. Choose the names first: model, variant(s), process(es); everything else references them + ([naming.md](naming.md)). 2. Add the model (`machine_model_list`) and one `machine` variant per nozzle; the minimum key sets are above. Bed assets and `_cover.png` go directly in `/`. 3. Add at least one process per variant naming it in `compatible_printers` ([process-profiles.md](process-profiles.md#adding-a-quality-tier-or-a-nozzles-processes)). -4. Register everything (or run `update-index`), bump the version, run the id tool, validate. +4. Add the variants to the filaments they should offer, and set the model's `default_materials` so every + variant has a compatible entry. +5. Register everything (`update-index`), bump the version, run the id tool, validate: the + [authoring workflow](../SKILL.md#creating-or-modifying-a-profile). ## Adding a nozzle variant 1. Extend the model's `nozzle_diameter` (`"0.4"` → `"0.4;0.6"`). -2. Add the variant preset. Either inherit the shared base (the usual choice) or the 0.4 sibling (Elegoo, - BBL, Prusa and Qidi do this — smaller diff, but the sibling's edits now reach this file too). -3. Override what actually changes with nozzle: `nozzle_diameter`, `printer_variant`, - `default_print_profile`, `default_filament_profile`, `min_layer_height`/`max_layer_height`, and +2. Add the variant preset. Either inherit the shared base (the usual choice), or the 0.4 sibling + (a smaller diff, but the sibling's edits now reach this file too). Follow the bundle. +3. Override what actually changes with the nozzle: `nozzle_diameter`, `printer_variant`, + `default_print_profile`, `default_filament_profile`, `min_layer_height` / `max_layer_height`, and retraction if the vendor tunes it. -4. Add at least one process for the new nozzle — see [process-profiles.md](process-profiles.md). +4. Add at least one process for the new nozzle (see [process-profiles.md](process-profiles.md)), and + extend the filaments' `compatible_printers` so at least one `default_materials` entry covers the new + variant. 5. Register both, bump the version, run the id tool, validate. -## Multi-extruder, IDEX and tool-changers +## Multi-extruder, IDEX and tool changers -Per-extruder vectors are **silently resized** to the nozzle count, with no error. Padding repeats the -**first** value, not the last — `["0.4","0.6"]` on a 4-nozzle machine becomes `0.4, 0.6, 0.4, 0.4`. -Longer vectors are truncated. +Per-extruder vectors hold one value per extruder (`len(nozzle_diameter)`), and a wrong length raises no +error: a short vector acts as padded with its **first** value, not the last (`extruder_offset` +`["0x0","50x0"]` on a 4-extruder machine reads as `0x0, 50x0, 0x0, 0x0`), and entries beyond the +extruder count are never read. -Note the two sizing families: the plain per-extruder keys (`extruder_offset`, `extruder_colour`, -`extruder_printable_height`, `min_layer_height`, `max_layer_height`, `nozzle_diameter`) are sized to the -extruder count, while `printer_options_with_variant_1` (`retraction_length`, `z_hop`, `wipe`, -`nozzle_type`, the rest of the retraction family) is sized to `printer_extruder_variant` instead. +Note the two sizing families. The plain per-extruder keys (`printer_extruder_options`: `extruder_type`, +`nozzle_diameter`, `default_nozzle_volume_type`, `extruder_printable_height`, `min_layer_height`, +`max_layer_height`, …, given in full with the [key sets](extruder-variants.md#the-four-key-sets), plus +`extruder_offset` and `extruder_colour`) hold one value per extruder. The variant sets +(`retraction_length`, `z_hop`, `wipe`, `nozzle_type`, the `machine_max_*` limits at stride 2; +[the full lists](extruder-variants.md#the-four-key-sets)) are sized to the variant length: +`len(printer_extruder_variant)`, or one variant per extruder when the resolved preset writes no layout, +since `extruder_variant_list` defaults to one `Direct Drive Standard` per extruder +([widths](extruder-variants.md#widths)). `extruders_count` is a printer-tab field, not a preset key; the +loader drops it. - Give **one entry per extruder** for ordinary per-extruder vectors such as `extruder_offset`, - `extruder_colour`, `min_layer_height` and `max_layer_height`; size the variant-dependent family - to `printer_extruder_variant` instead. - A single `["0x0"]` `extruder_offset` on a dual or multi-tool machine — which already ships — pads every - toolhead to the same offset, so the offset never applies. -- Overriding `nozzle_diameter` to a different count without re-stating every per-extruder vector is the - other half of the trap — `Snapmaker U1 (0.4+0.6 nozzle)` inherits 5-entry vectors against 4 nozzles. + `extruder_colour`, `min_layer_height` and `max_layer_height`. Size the variant sets to the variant + length × stride, one value per variant (per extruder when there is no layout; a (normal, silent) + pair for the `machine_max_*` limits), even where the values are the same; the loader keeps only the first value of a list-less printer's variant arrays, so declare + the layout when the extruders differ. A single `["0x0"]` `extruder_offset` on a dual or + multi-extruder machine pads every extruder to the same offset, so the offset never applies. +- Overriding `nozzle_diameter` to a different count without restating every per-extruder vector is the + other half of the trap: a 4-extruder preset on a 5-extruder base inherits 5-entry vectors against 4 + extruders. + The reverse is silent too: a base is stored resized to its own `printer_extruder_variant` (one variant + when it writes none, whatever its extruder count), so a wider variant array on it reaches the children + as its first value padded ([composition](extruder-variants.md#padding-truncation-and-composition)). + `check` does not judge the base on its own; where its extruders need different values, declare the + layout on the base. -Copy targets: `Custom/machine/fdm_toolchanger_common.json` + `Custom/machine/MyToolChanger 0.4 -nozzle.json` (a clean minimal variant on a base that gives every vector five entries), and -`Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json` for IDEX. The BBL extruder-variant machinery -(`extruder_variant_list`, `printer_extruder_id`, `default_nozzle_volume_type`) is used by a handful of -vendors — do not copy it into a new bundle (`nozzle_volume_type` itself is not a machine-preset key). +Structure to copy: `Custom/machine/fdm_toolchanger_common.json` + `Custom/machine/MyToolChanger 0.4 +nozzle.json` (a minimal variant on a base that gives the per-extruder vectors five entries), and +`Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json` for IDEX. Take the structure from them and +the widths from the [sizing equation](extruder-variants.md#sizing-equation). Both are list-less, so +every variant array holds one value per extruder and the loader keeps only the first: fine while every +extruder shares the same retraction and limits. Add the extruder-variant layout +(`extruder_variant_list`, `printer_extruder_variant` / `printer_extruder_id`, +`default_nozzle_volume_type`) when the hardware has swappable nozzle volume types or mixed extruder +types, or as soon as one extruder needs its own value in a variant key; how to author it, and the +matching process and filament variants, is in [extruder-variants.md](extruder-variants.md). +(`nozzle_volume_type` itself is not a machine-preset key.) ## Custom G-code The keys are `machine_start_gcode`, `machine_end_gcode`, `change_filament_gcode`, -`machine_pause_gcode`, `before_layer_change_gcode` and `layer_change_gcode`. Both a single string with -embedded `\n` and a JSON array of lines are legal and both are in use — do not convert one into the -other. Conditionals are `{if …}` / `{elsif …}` / `{else}` / `{endif}`; `{elsif}` is rare but real (Qidi's -`layer_change_gcode` uses it). +`machine_pause_gcode`, `before_layer_change_gcode` and `layer_change_gcode`. Each is one string with +embedded `\n`. Never split G-code into a JSON array of lines: the loader joins array elements with `,` +into a single line (a one-element array is equivalent to the string): a two-element +`machine_start_gcode` becomes one line, `PRINT_START …,SET_PRESSURE_ADVANCE ADVANCE=0.046`. +Conditionals are `{if …}` / `{elsif …}` / `{else}` / `{endif}`. -Placeholder errors only surface when the config is actually expanded, which means `validate_slice`: +Placeholder errors only surface when the G-code is actually expanded, which means `validate_slice`: ```bash ./scripts/check_profile.sh --vendor "" validate_slice # Windows: scripts\check_profile.bat -Vendor "" validate_slice ``` -What the sweep covers is in [validation.md](validation.md#validate_slice); no `CP TOOLCHANGE START` in -the output means `change_filament_gcode` never expanded. +What the sweep covers is in [validation.md](validation.md#validate_slice); a printer whose output has no +`CP TOOLCHANGE START` fails it, because its `change_filament_gcode` never expanded. diff --git a/.claude/skills/orca-profiles/references/naming.md b/.claude/skills/orca-profiles/references/naming.md index cad82ebb6b..e2fd5a4d88 100644 --- a/.claude/skills/orca-profiles/references/naming.md +++ b/.claude/skills/orca-profiles/references/naming.md @@ -1,90 +1,94 @@ # Preset naming -A preset's `name` is the loader's key, not decoration. The index registers it; `inherits`, -`compatible_printers` and the `default_*` keys reference it by the exact string; `renamed_from` depends -on it; and `setting_id` / `filament_id` hash it (see [ids.md](ids.md)). Two presets of one type in a -bundle may not share a name (`check_preset_name_uniqueness`). Treat a name change as an identity change, -not a relabel. - -Naming is convention only where the loader does not parse it. What the loader actually acts on: - -| Type | Shape | Acted on | -| --- | --- | --- | -| `machine_model` | `` | the exact string, named by a variant's `printer_model` | -| `machine` | ` nozzle` | the exact string, named by `compatible_printers`; `printer_variant` must equal a nozzle diameter | -| `process` | `mm @` | the exact string when referenced or selected; the `@` half is a label | -| `filament` | ` @` | text before the first `@` is the **alias**, used for shadowing; the rest is a label | +A preset's `name` is its identity, not decoration. The index registers it; `inherits`, +`compatible_printers`, `printer_model` and the `default_*` keys reference it by the exact, +case-sensitive string; `renamed_from` migrates it; `setting_id` and `filament_id` hash it +([ids.md](ids.md)). Treat a name change as an identity change that needs +[migration](vendor-bundle.md#renamed_from), not a relabel. Which part of each name the loader acts on +is the table in [SKILL.md](../SKILL.md#names); this page holds the conventions. ## `machine_model` -`` — the vendor-prefixed model name (`Bambu Lab X1 Carbon`, `Creality K1`, `Prusa CORE One`). A -variant names it verbatim in `printer_model`; a mismatch makes the variant invalid. `check_name_consistency` -forces the index entry to equal the file's `name`, and the variant's `printer_model` targets this string -([A `machine_model` is not a config preset](machine-profiles.md#a-machine_model-is-not-a-config-preset)). -It is also the `_cover.png` and bed-asset stem. +``, vendor-prefixed: `Bambu Lab X1 Carbon`, `Creality K1`, `Prusa CORE One`. Each variant's +`printer_model` names it verbatim (a mismatch discards the bundle), and its index entry equals the +file's `name`. It is also the stem of `_cover.png` and, by convention, of the bed assets +(`_buildplate_model.stl`). ## `machine` (variant) -` nozzle` is near-universal (`Bambu Lab X1 Carbon 0.4 nozzle`). `printer_variant` holds -the bare nozzle (`0.4`) and must be an exact member of the model's `nozzle_diameter` list — the hard -rules are in [The `machine` variant](machine-profiles.md#the-machine-variant). Casing varies -(`nozzle` / `Nozzle`): match the bundle, not this page. A variant that is not nozzle-specific (a special -toolhead, a multi-material build) may drop the suffix — still an exact reference. Bases are named -`fdm_machine_common` / `fdm__common`. +` nozzle` is near-universal (`Bambu Lab X1 Carbon 0.4 nozzle`). Casing varies +(`nozzle` / `Nozzle`): match the bundle, not this page. A variant that is not nozzle-specific (a +special toolhead, a multi-material build, IDEX copy and mirror modes such as +` COPY MODE (0.4 nozzle)`) may drop or reshape the suffix; it is still an exact reference. `printer_variant` +holds the nozzle token: `0.4`, a suffixed `0.4HF`, or `0.4+0.6` for mixed nozzles +([rules](machine-profiles.md#printer_model-and-printer_variant)). ## `process` -`mm @` — [process-profiles.md](process-profiles.md#naming) has the -quality ladder and the `fdm_process_*` base names. The quality label stays before `@` and the printer -target after it: a printer model in the quality slot leaves the tier undescribed. The `@` is a -human label, not a reference: it usually does not equal a real variant, and compatibility comes from the -resolved `compatible_printers` list or condition. +`mm @`. The quality word stays before `@` and the printer target after +it: a printer model in the quality position leaves the tier undescribed. The `@` is a label, +and need not equal any variant name; compatibility comes from `compatible_printers` or the +condition. The quality ladder and per-nozzle labels are in +[process-profiles.md](process-profiles.md#naming). ## `filament` -` @`. The product half is what `filament_id` hashes and what survives as the **alias** up -to the first `@`; the target half is a label except for reserved forms: +` @`. The product half, up to the first `@` and right-trimmed, is the **alias**: +shadowing matches on it and `filament_id` hashes it. The target half is a label, except for the +reserved forms: -- `@base` — a non-instantiated product root. `@base` is convention; a base is really identified by - `instantiation: "false"` and no `setting_id` ([the three-part shape](filament-profiles.md#the-three-part-shape)). -- `@System` — the OrcaFilamentLibrary selectable shim, and the convention for an all-printer product - (` @System`, empty `compatible_printers`); not enforced, so a deviation is worth a review - comment. The literal `Generic @System` is load-bearing for 3MF/project recovery, beyond the - alias rule ([alias shadowing](filament-profiles.md#alias-shadowing)). -- `@`, `@ `, `@ nozzle` — printer tunes, BBL's shape. - Other vendors differ (a bare model, a printer serial, Creality's `@-all`). Specificity is judged - from `compatible_printers`, not the name +- `@base`: a non-instantiated product root. Convention only; a base is really + `instantiation: "false"` without `setting_id` + ([the three-part shape](filament-profiles.md#the-three-part-shape)). +- `@System`: the OrcaFilamentLibrary selectable shim, and the convention for an all-printer product + (` @System`, empty `compatible_printers`). Not enforced, so a deviation is worth a review + comment. The literal `Generic @System` is also load-bearing for project recovery + ([alias shadowing](filament-profiles.md#alias-shadowing)). +- Printer tunes. BBL's shape is the reference: `@` (vendor-wide), `@ ` (one + model), `@ nozzle` (one variant). Other vendors differ: a bare model + (`QIDI ABS-GF@Q2-Series`), a printer serial, Creality's `@-all`. Judge specificity from + `compatible_printers`, never from the name ([one variant, one profile](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product)). -- Color is not part of the product name: ` ` presets are not authored; the color is - chosen at runtime - ([color is a runtime property](filament-profiles.md#color-is-a-runtime-property)). +- No colour in the product name: ` ` presets are not authored; colour is chosen at + runtime ([colour](filament-profiles.md#colour-is-a-runtime-property)). -## Checking names - -Check every newly added profile's `name` against its type and role: model, selectable preset or base. -Apply the same checks to an intentional name change. The human-readable naming shapes are not enforced -by `check`: inspect the added or renamed profiles in the diff, using neighbouring names as context and -following the bundle's established style where the type-specific conventions allow variation. - -For bases (`instantiation: "false"`), use the type-specific conventions: +## Bases | Type | Base names | | --- | --- | -| `machine` | `fdm_machine_common`, `fdm__common`, or an established machine-family base name | -| `process` | `fdm_process_*`, including shared roots and per-layer-height / per-nozzle bases such as `fdm_process_single_0.20` | -| `filament` | `fdm_filament_*` material roots or ` @base` product roots | +| `machine` | `fdm_machine_common`, `fdm__common`, `fdm_klipper_common`, or an established machine-family base | +| `process` | `fdm_process_*`: shared roots and per-layer-height or per-nozzle bases such as `fdm_process_single_0.20` or `fdm_process___nozzle_` | +| `filament` | `fdm_filament_*` material roots, ` @base` product roots | -Shared base names across bundles are intentional, including product roots such as `Fiberon PA6-CF @base`. -Investigate a newly authored base that retains an unrelated selectable preset's name from a copy. +There is no leading-underscore convention. Base names repeat across bundles by design: +every bundle may have its own `fdm_process_common`, and a product root such as `Fiberon PA6-CF @base` +can exist in both the library and a vendor. Investigate a newly authored base that kept an unrelated +selectable preset's name from a copy. -**Name uniqueness is checked by CI.** `check_preset_name_uniqueness` checks type + name within each -bundle. `check_machine_model_name_uniqueness` checks model names across the entire tree, even with -`--vendor`: `Preset::get_printer_type` matches `printer_model` against all vendors' models and returns -the first match, so a duplicate makes lookup depend on vendor order. Both run as part of -`python3 scripts/orca_profile_tool.py check`. +## Uniqueness -## Not the same as the filename +- Type + name is unique within a bundle, indexed or not; `check` enforces it. +- `machine_model` names are unique across the whole tree; `check` enforces it even with `--vendor`. + Printer-type lookup matches `printer_model` against every vendor's models and takes the first, so a + duplicate makes it depend on vendor order. +- At load, two selectable presets with one name discard the bundle, and a duplicate across vendors + is a validator error. Two bases with one name, or a base and a selectable preset, load silently and + the first in the index wins; an unindexed twin is therefore one `sub_path` edit away from becoming + the parent every child resolves to. -The loader keys off `name`, and a filename that disagrees usually still loads. Index `name` must equal the -file's `name`, and the filename should match `sub_path`; a mismatch that differs only in case breaks -another platform ([cross-platform paths](validation.md#cross-platform-paths)). +## Filenames and paths + +The loader keys off `name`, and a filename that disagrees usually still loads, but keep the filename +equal to the `name` and to the index `sub_path`. Match the exact case of every `sub_path` and asset +filename: Linux filesystems distinguish case even when a macOS or Windows checkout does not, and +preset-name references are case-sensitive on every platform. Avoid Windows-invalid characters +(`< > : " | ? *`), reserved device names such as `CON` and `NUL` (with any extension), and trailing +spaces or dots in a path component; a space right before `.json` is not a trailing space. + +## Checking names + +Check the `name` of every newly added profile, and every intentional rename, against its type and role +(model, selectable preset or base). `check` does not enforce the shapes on this page: inspect the +added or renamed presets in the diff, use neighbouring names as context, and follow the bundle's +established style where the conventions allow variation. Preserve shipped names during ordinary +tuning; renaming a shipped selectable preset needs `renamed_from`. diff --git a/.claude/skills/orca-profiles/references/process-profiles.md b/.claude/skills/orca-profiles/references/process-profiles.md index 98f31bac1a..785c9ee358 100644 --- a/.claude/skills/orca-profiles/references/process-profiles.md +++ b/.claude/skills/orca-profiles/references/process-profiles.md @@ -1,14 +1,15 @@ # Process profiles -Processes live in `resources/profiles//process/` — selectable leaves and shared bases alike, and +Processes live in `resources/profiles//process/`, selectable leaves and shared bases alike, and every one of them is registered in `process_list`. There are no global processes shared across vendors. ## Naming -`"mm @"` — near-universal, so match it. +`"mm @"` is near-universal, so match it: the quality word before `@`, +the printer label after it ([naming.md](naming.md#process)). -Follow the bundle's existing quality vocabulary. BBL's common ladder relates the quality word to -the layer-height / nozzle ratio; it is a naming convention, not a loader constraint: +Follow the bundle's existing quality vocabulary. BBL's common ladder relates the quality word to the +layer height / nozzle ratio; it is a naming convention, not a loader constraint: | Quality | Ratio | 0.2 nozzle | 0.4 | 0.6 | 0.8 | | --- | --- | --- | --- | --- | --- | @@ -20,49 +21,50 @@ the layer-height / nozzle ratio; it is a naming convention, not a loader constra | Extra Draft | 0.7× | 0.14 | 0.28 | 0.42 | 0.56 | This is the `fdm_process_single__nozzle_` ladder; 0.4 is commonly the unsuffixed nozzle default. -Match neighbouring names rather than renaming shipped tiers to fit the table. +Newer BBL printers add High Quality, Balanced Quality and Strength tiers. Match neighbouring names rather +than renaming shipped tiers to fit the table. On a model with several nozzles, processes for the other +nozzles usually carry the nozzle in the label (`0.30mm Standard @BBL X1C 0.6 nozzle`); follow the bundle. -The `@target` is a human label, not a reference: most do not equal any real printer variant name. +The `@target` is a human label, not a reference: it need not equal any printer variant name. Compatibility comes from the resolved list or condition, not this label. ## Shape -A selectable leaf's only truly universal keys are `type`, `setting_id`, `name` and `instantiation`; -`inherits` and `from` are near-universal — plus compatibility. No slicing key is universal; even -`layer_height` is more often inherited than restated. A base has `type`, `name`, `instantiation`, almost -always `from`, and **no** `setting_id`. +A selectable leaf has `type`, `setting_id`, `name` and `instantiation`, normally `inherits` and +`from`, plus compatibility; its slicing keys, `layer_height` included, normally come from its bases. A +base has `type`, `name`, `instantiation`, `from`, and **no** `setting_id`. -**Target shape: a 7-key leaf.** `OrcaArena` is the cleanest model — +**Target shape: a 7-key leaf.** `OrcaArena` is the cleanest model: `fdm_process_common` → `fdm_process_arena_common` → `fdm_process_arena__nozzle_` → leaf, where the -leaf carries only `type`, `name`, `inherits`, `from`, `setting_id`, `instantiation`, +leaf carries only `type`, `name`, `inherits`, `from`, `setting_id`, `instantiation` and `compatible_printers`, and the per-nozzle base holds the layer height and all eight line widths. +[shared-bases.md](shared-bases.md#levels) says which level each process setting belongs to. -BBL, WonderMaker and Z-Bolt are uniform in *layering* — every leaf inherits a base, names its printers -directly and holds no layer height of its own — but not in key count. Imitate BBL's layering, not its -content: its leaves carry doubled `print_extruder_variant` arrays that no single-variant vendor needs. +BBL's *layering* is a model too (every leaf inherits a base, names its printers directly and holds no +layer height of its own), but not its content: its leaves carry multi-variant `print_extruder_variant` +arrays that no single-variant vendor needs ([extruder-variants.md](extruder-variants.md#process)). -Nearly every vendor ships its own `fdm_process_common` as the inherits-less root. Those files are not -identical; copying another vendor's version into a new bundle is normal. +A bundle has its own `fdm_process_common` as the inherits-less root, since a process inherits only +inside its bundle; starting a new bundle's from another vendor's copy is fine. -Beware leaf-inherits-leaf: Prusa chains several levels deep through sibling leaves, and Elegoo and -Flashforge do it too, so editing one selectable process silently changes others. Check a leaf's children -before editing it. +Beware leaf-inherits-leaf: a bundle may chain selectable processes several levels deep, so editing one +silently changes others. Check a leaf's children before editing it. ## Compatibility -Most leaves set `compatible_printers` directly; some inherit it from a base, and Prusa's fall through to +A leaf sets `compatible_printers` directly, inherits it from a base, or falls through to `compatible_printers_condition`. After resolving `inherits`, **every selectable process has one or the -other** — that is the invariant to review against. Unlike filaments, inheriting `compatible_printers` is +other**: that is the invariant to review against. Unlike filaments, inheriting `compatible_printers` is legitimate for a process, and no check enforces its presence. -- A non-empty `compatible_printers` makes `compatible_printers_condition` **dead code**. Use one or - the other. -- A condition that fails to parse means *compatible with everything* — a warning, not an error. A typo +- A non-empty `compatible_printers` makes `compatible_printers_condition` **dead**. Use one or the + other. +- A condition that fails to parse means *compatible with everything*: a warning, not an error. A typo widens compatibility instead of narrowing it. -- Matching is `boost::regex` **`regex_match`** — a full-string match, which is why every shipped - condition wraps its keyword in `.*`. Because it is boost rather than `std`, `.` also spans the newlines - inside `printer_notes`. -- A `printer_notes` keyword that prefixes another model's keyword matches both. Prusa guards it: +- A regex in a condition must match the **whole** string, so wrap the keyword in `.*`; `.` also spans + the newlines inside `printer_notes`. +- A `printer_notes` keyword that prefixes another model's keyword matches both. Guard it with a + character class after the keyword, and combine terms with `and`: ``` printer_notes=~/.*PRINTER_MODEL_COREONE[^_a-zA-Z0-9].*/ and nozzle_diameter[0]==0.4 and printer_notes=~/.*HF_NOZZLE.*/ @@ -70,76 +72,84 @@ legitimate for a process, and no check enforces its presence. The `[^_a-zA-Z0-9]` exists because `PRINTER_MODEL_COREONE_L` also contains `PRINTER_MODEL_COREONE`. -`compatible_printers` is almost always one element. A leaf listing a whole model family is where a newly -added printer is usually forgotten. +A leaf listing a whole model family is where a newly added printer is usually forgotten. -## What to review per nozzle +## Values to review per nozzle | Key group | Review | | --- | --- | | `line_width` and per-region widths | resolved widths suit the nozzle and layer height | -| `layer_height`, `initial_layer_print_height` | within the printer's limits | +| `layer_height`, `initial_layer_print_height` | within the printer's `min_layer_height` / `max_layer_height` | | print speeds | consistent with flow limits and hardware tuning | -| shell layers, wall loops, accelerations, support Z distances | preserve the intended thickness, motion and support behavior | +| shell layers, wall loops, accelerations, support Z distances | preserve the intended thickness, motion and support behaviour | -**A common starting pattern is nozzle + 0.02 mm**: 0.22 / 0.42 / 0.62 / 0.82 / 1.02. In that pattern, at 0.4, -`inner_wall_line_width`, `sparse_infill_line_width`, `skin_infill_line_width` and +**A common starting pattern is line width = nozzle + 0.02 mm**: 0.22 / 0.42 / 0.62 / 0.82 / 1.02. In +that pattern, at 0.4, `inner_wall_line_width`, `sparse_infill_line_width`, `skin_infill_line_width` and `skeleton_infill_line_width` widen to 0.45 and `initial_layer_line_width` to 0.5; at 0.2, `initial_layer_line_width` widens to 0.25. Also derived, and easily missed: -`ironing_inset = line_width / 2` (0.11 / 0.21 / 0.31 / 0.41). -These are examples, not required values; preserve intentional vendor tuning and percentage/automatic -widths, and validate their resolved values. +`ironing_inset = line_width / 2` (0.11 / 0.21 / 0.31 / 0.41). These are examples, not required values; +preserve intentional vendor tuning and percentage or automatic widths, and validate their resolved +values. -`min_layer_height` and `max_layer_height` are machine keys — no process file sets them. +`min_layer_height` and `max_layer_height` are machine keys; no process file sets them. -## Slice-time content checks +### Slicing limits -`Print::validate()` enforces four rules at slice time: +Slicing rejects a process that breaks one of these (the message in italics): -1. `initial_layer_print_height` ≤ min `nozzle_diameter` -2. `layer_height` ≤ min `nozzle_diameter` — *"Layer height cannot exceed nozzle diameter."* -3. `line_width` and the seven per-region widths (inner/outer wall, sparse infill, internal solid infill, - top surface, skin, skeleton) > `layer_height` — *"Line width too small"*. `support_line_width` only - when the object has support or a raft; `initial_layer_line_width` is never checked. -4. every width ≤ 5 × max `nozzle_diameter` — *"Line width too large"* +1. `initial_layer_print_height` ≤ the smallest `nozzle_diameter` (with a raft, the nozzle of the raft's + first-layer extruder). +2. `layer_height` ≤ the smallest `nozzle_diameter`: *"Layer height cannot exceed nozzle diameter."* +3. `line_width` and the seven per-region widths (inner and outer wall, sparse infill, internal solid + infill, top surface, skin, skeleton) > `layer_height`: *"Line width too small"*. + `support_line_width` is checked only when the object has support or a raft; + `initial_layer_line_width` is never checked. A width that resolves to 0 (automatic) is skipped. +4. Every width ≤ 5 × the largest `nozzle_diameter`: *"Line width too large"*. -Two further rules cover `bridge_line_width` (≤ nozzle diameter; > `layer_height` unless `thick_bridges` -and `thick_internal_bridges` are both on). The sweep starts from printer defaults rather than -enumerating every process. **A new non-default process gets no dedicated slice coverage in CI.** +Two further rules cover `bridge_line_width`: it must not exceed the nozzle diameter, and must exceed +`layer_height` unless `thick_bridges` and `thick_internal_bridges` are both on. The slice sweep starts +from printer defaults rather than enumerating every process: **a new non-default process gets no +dedicated slice coverage in CI.** ## What CI checks on a process Structure, not content: `process_list` name consistency **and** index coverage the other way, two files claiming one process name, the `extruder_clearance_radius` / `extruder_clearance_max_radius` conflict -pair, duplicate JSON keys, a file `normalize` would rewrite, and the five `setting_id` rules (the fifth -rejects the misspelled key `settings_id`). `compatible_printers` presence is checked for **filaments -only**. +pair, duplicate JSON keys, a file `normalize` would rewrite, the five `setting_id` rules (present on +selectable presets, absent from bases, equal to the formula outside `BBL/`, unique across the tree, and +no misspelled key `settings_id`), and the variant arrays: every array of `print_options_with_variant` +exactly `variant length × stride` wide in each selectable process that writes it, and a written +`print_extruder_id` one entry per variant +([variant arrays](validation.md#variant-arrays)). `compatible_printers` presence is checked for +**filaments only**. -Note the C++ loader derives a missing `setting_id` on the fly, so the validator will not fail a process -without one — only `orca_profile_tool.py check` catches it. Running the validator alone gives a false -all-clear. +The loader derives a missing `setting_id` on the fly, so the validator accepts a process without one; +only `orca_profile_tool.py check` catches it. +Running the validator alone gives a false all-clear. ## Silent failures specific to processes -- **Unknown or misspelled keys are discarded with no error and no warning.** They ship all over the - process tree, both plain typos (`inital_layer_height`, `tree_support_bramch_diameter_angle`, - `sparse_infill_patter`) and keys copied from other slicers that Orca never defined. -- Keys on the tool's `OBSOLETE_KEYS` list (`adaptive_layer_height`, `overhang_totally_speed`, …) are - rejected by `check`'s normalization pass across preset types; `normalize` removes them. - The additional per-key obsolete warnings read `filament/` only. -- A dangling `compatible_printers` inside an `instantiation: "false"` base is invisible to - `check_preset_references`: a base never becomes a `Preset` at all (its config goes into `config_maps` - and the loader returns early), so it is in no collection for the check to walk. -- Orphan bases that nothing inherits are scattered through the tree — usually the leftover of a - half-finished nozzle addition. +- **Unknown or misspelled keys are discarded with no error and no warning**, both plain typos + (`inital_layer_height`, `tree_support_bramch_diameter_angle`, `sparse_infill_patter`) and keys + copied from other slicers that Orca never defined. +- Keys on the tool's obsolete list (`adaptive_layer_height`, `overhang_totally_speed`, …) are rejected + by `check`'s normalization pass across preset types; `normalize` removes them. The additional per-key + obsolete warnings read `filament/` only. +- A dangling `compatible_printers` inside an `instantiation: "false"` base is reported only through a + selectable child that inherits it unchanged; it goes unreported when every child overrides the list, + or when the base has no instantiated children. +- Nothing flags an orphan base that nothing inherits, usually the leftover of a half-finished nozzle + addition. ## Adding a quality tier or a nozzle's processes -1. Choose the layer height and quality label using the vendor's existing ladder. -2. If the vendor has per-nozzle bases, add one (`fdm_process___nozzle_`) with the layer +1. Choose the layer height and quality label using the bundle's existing ladder. +2. If the bundle has per-nozzle bases, add one (`fdm_process___nozzle_`) with the layer height, nozzle-appropriate line widths, `initial_layer_print_height` and `ironing_inset`. 3. Add the leaf: 7 keys, `compatible_printers` naming the exact printer variant(s). -4. Register both in `process_list`, parent first. Bump the version, run the id tool, validate. -5. Slice this process explicitly with its intended printer; the sweep gives non-default tiers no - dedicated coverage. If it is a printer's `default_print_profile`, verify the exact name and - resolved compatibility too — the sweep may fall back or select another compatible process. +4. Register both in `process_list`, parent first, bump the version, run the id tool and validate: the + [authoring workflow](../SKILL.md#creating-or-modifying-a-profile). +5. Slice this process explicitly with its intended printer + ([on a copy of the tree](validation.md#checking-a-copy-of-the-tree)); the sweep gives non-default + tiers no dedicated coverage. If it is a printer's `default_print_profile`, verify the exact name and + resolved compatibility too: the sweep may fall back or select another compatible process. diff --git a/.claude/skills/orca-profiles/references/review-checklist.md b/.claude/skills/orca-profiles/references/review-checklist.md index 1d49cf2524..9037e364b4 100644 --- a/.claude/skills/orca-profiles/references/review-checklist.md +++ b/.claude/skills/orca-profiles/references/review-checklist.md @@ -1,37 +1,43 @@ # Reviewing a profile change -Start with delivery, identity and backward compatibility, then check the affected preset types. -The table highlights gaps that need human review. What CI *does* run: -[validation.md](validation.md). +Run `./scripts/check_profile.sh` on the applied diff first ([validation.md](validation.md) says what CI +runs), then work through the items below: delivery, identity and backward compatibility first, then the +affected preset types. The table lists the gaps CI cannot see, so only a reviewer catches them. | Not checked by CI | Consequence | | --- | --- | -| The `version` bump | The change never reaches an upgrading user | -| A misspelled setting key | Setting silently has no effect | +| The `version` bump | The change never reaches an upgrading user; an absent `version` hides the vendor from the setup wizard | +| A misspelled setting key | The setting silently has no effect | | A filename Windows cannot check out, or one that differs from its `sub_path` only in case | Works on the author's machine, breaks the bundle on another platform | -| `bed_model` / `bed_texture` / `hotend_model` pointing at a missing asset | Bed renders as Custom, hotend falls back to the generic model | +| `bed_model` / `bed_texture` / `hotend_model` / cover pointing at a missing asset | A missing bed model renders a generic custom bed and a missing texture renders none, the hotend falls back to the generic model, the cover shows a placeholder | | A nozzle size in a model's list with no matching variant | The size is offered and resolves to nothing | | A non-default process | `validate_slice` gives non-default quality tiers no dedicated coverage | | Whether the intended default survived compatibility selection | The sweep can select a different compatible preset | -| A dangling `compatible_printers` inside an `instantiation: "false"` base | A base never becomes a `Preset`, so the reference check never sees it (a bad `inherits` in a base *is* caught) | +| A dangling `compatible_printers` inside a base whose children all override it (or that has no instantiated children) | The reference check walks resolved selectable presets, so it reports a base's list only through a child that inherits it unchanged (a bad `inherits` in a base *is* caught) | +| A base nothing inherits | Dead weight, usually the leftover of an unfinished nozzle addition | | A `renamed_from` whose old name is still a live preset | The redirect is inert while a live preset carries that name | -| A preset differentiated only by color, or an all-printer library preset without `@System` | Per-color presets split one product across ids and the selector fills with near-duplicates; CI stays green | -| Per-extruder vector length on a multi-nozzle printer | Silently padded (with the **first** value) or truncated | -| A name that ignores its type's convention — a model in a `process` quality slot, or an unrelated target label left in a copied preset | The selector misrepresents the preset's quality or intended printer | +| A preset differentiated only by colour, or an all-printer library preset without `@System` | Per-colour presets split one product across several ids and the selector fills with near-duplicates; CI stays green | +| Plate temperatures for plates the printer has | The user's plate reads an unset or inherited temperature | +| Per-extruder vector length on a multi-extruder printer | Silently padded (with the **first** value) or truncated | +| A new variant appended instead of inserted at its variant index, a variant array widened on a base with a shorter list, or a variant a filament/process lacks | Values shift onto the wrong extruder, are cut before any child inherits them, or resolve to the first variant: High Flow silently gets Standard values | +| A name that ignores its type's convention: a printer model in a `process` quality position, or an unrelated target label or base name left in a copied preset | The selector misrepresents the preset's quality or intended printer | +| Values: temperatures, speeds, widths, pressure advance | A wrong value prints wrong while CI stays green | ## 1. Was the vendor `version` bumped? For **every** bundle whose folder the diff touches, `resources/profiles/.json` must have its -`version` incremented — last component, carrying `.99` into the third component. A library change -means bumping `OrcaFilamentLibrary.json`. +`version` incremented: last component, carrying `.99` into the third component. A library change means +bumping `OrcaFilamentLibrary.json`. -*Why:* nothing in CI checks it, and `PresetUpdater` reinstalls only when `vendor_ver < resource_ver` — -without a bump the change reaches neither an upgrading user nor the author's own running app. +*Why:* nothing in CI checks it, and the app reinstalls a bundled profile set only when its version is +newer than the installed one: without a bump the change reaches neither an upgrading user nor the +author's own running app. Without any `version` the vendor vanishes from the setup wizard, and neither +`check` nor the validator reports it. ## 2. Was the index rebuilt, and does the diff contain only this change? -`check` now fails on an unregistered file, on an index `update-index` would reorder, and on a file -`normalize` would rewrite — so a PR that skipped them arrives red, and you do not have to spot the +`check` fails on an unregistered file, on an index `update-index` would reorder, and on a file +`normalize` would rewrite, so a PR that skipped them arrives red and you do not have to spot the omission yourself. Three things are still yours: - **The index diff belongs to this change.** `update-index` rewrites whole `*_list` sections. If the @@ -41,11 +47,15 @@ omission yourself. Three things are still yours: registration; `validate_custom` detects the break only for names covered by released fixtures. - **`normalize` edits content, not just layout.** It drops `version` and `is_custom_defined` from preset files, removes obsolete keys, deletes six print-speed keys from filament profiles, and resolves - `extruder_clearance_radius` against `extruder_clearance_max_radius` by keeping the larger. - Check that the keys it removed were meant to go. + `extruder_clearance_radius` against `extruder_clearance_max_radius` by keeping the larger + ([what normalize changes](validation.md#normalize-and-update-index-are-part-of-the-check)). Check that + the keys it removed were meant to go. -Obsolete keys fail `check`'s normalization pass and should be removed with `normalize`. -`check` also reports per-key obsolete warnings for filament profiles in the selected vendors. +Index order is dependency order, not alphabetical: parents and include templates before the presets +that use them, then, in name order, the entries that neither depend on nor are depended on by another +entry of their own list (such as a leaf filament whose only parent is in the library), and any entry on +a dependency cycle. Judge a hand-placed entry only by +`update-index --dry-run`: if it reports nothing to rebuild, the position is not a finding. *Why:* the index is the loader's only entry point. Out-of-order entries fail with `can not find inherits` and take the whole vendor bundle down; an unindexed file gets reviewed, merged and never loads. @@ -55,8 +65,8 @@ and take the whole vendor bundle down; an unindexed file gets reviewed, merged a No hand-typed or copied `setting_id` / `filament_id`. Instantiated presets have a `setting_id`; bases do not. `check` enforces all of that; what it cannot tell you is whether the identity *should* have moved. -A rewritten or removed `filament_id` means a product's identity moved — a rename, or an edited -`filament_vendor` / `filament_type` — and the old id is not forwarded anywhere. Confirm that was +A rewritten or removed `filament_id` means a product's identity moved (a renamed alias, or an edited +`filament_vendor` / `filament_type`), and the old id is not forwarded anywhere. Confirm that was intended, and that a new id is not a rename in disguise. *Why:* a duplicate `filament_id` on one printer makes AMS spool matching a coin toss; a copied @@ -64,136 +74,204 @@ intended, and that a new id is not a rename in disguise. ## 4. Does anything disappear for existing users? -A rename, a deletion, or a flip of `"instantiation": "true"` → `"false"` on a shipped preset removes the -name from the preset collection. It needs `renamed_from` on a successor — and only one preset may claim a -given old name. The claimed old name must **not** still be a live preset; the redirect is inert if it is. +A rename, a deletion, or a flip of `"instantiation": "true"` → `"false"` on a shipped selectable preset +removes the name from the preset collection. It needs `renamed_from` on a selectable successor +([renamed_from](vendor-bundle.md#renamed_from)), and only one preset may claim a given old name. The +claimed old name must **not** still be a live preset; the redirect is inert if it is. *Why:* user presets inheriting it die with `can not find parent for config !`; 3MF-embedded presets are dropped with no error at all. Commit `33923464ae` reverted exactly this for Cubicon; -`6943b6ddc3` redid it correctly. CI's `validate_custom` catches the shipped-name case — but not an inert -`renamed_from`. +`6943b6ddc3` redid it correctly with `renamed_from`. CI's `validate_custom` catches the shipped-name +case, but not an inert `renamed_from`. ## 5. Is `compatible_printers` right? -Exact printer **variant** names, non-empty on every instantiated filament outside OrcaFilamentLibrary -and written in the preset's own file — golden rule 6, with the flattened-vs-own-key trap in -[filament-profiles.md](filament-profiles.md#compatible_printers). Watch for a nozzle-specific variant that -inherited or copied the base's full printer list, and for two presets of one product with overlapping -lists — duplicate combobox entries and an ambiguous AMS match. +Exact printer **variant** names, non-empty on every instantiated filament outside OrcaFilamentLibrary, +and written in the preset's own file ([SKILL.md rule 9](../SKILL.md#rules); the resolved-vs-own-key trap +is in [filament-profiles.md](filament-profiles.md#compatible_printers)). A `machine_model` name instead +of a variant name is the usual mistake: `check` passes it, the validator reports +`references unknown compatible_printers`. Watch for a nozzle-specific tune that inherited or copied the +base's full printer list, and for two presets of one product with overlapping lists: duplicate combobox +entries and an ambiguous AMS match. Two presets of one product (`filament_id`) must not share a variant. Resolve it by specificity: move the -variant to the most specific preset and remove it from the more general ones — preferred over deleting a -profile. Then repoint the machine's `default_filament_profile` and the model's `default_materials` at the -profile that now covers it. See +variant to the most specific preset and remove it from the more general ones, which is preferred over +deleting a profile. Then repoint the machine's `default_filament_profile` and the model's +`default_materials` at the profile that now covers it. See [one variant, one profile](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product). -*Why:* real shipped bugs twice (`b7b3418baf` "showing up everywhere", `ff83aa41ef` duplicate Flashforge -entries). The Python `check` passes on an overlap; only the full `check_profile.sh` (`validate_system`) -reports `Ambiguous AMS filament match`. +*Why:* real shipped bugs twice (`b7b3418baf` filaments "showing up everywhere", `ff83aa41ef` duplicate +Flashforge entries). The Python `check` passes on an overlap; only the full `check_profile.sh` +(`validate_system`) reports `Ambiguous AMS filament match`. -## 6. Model ↔ variant ↔ process consistency +## 6. One product, one all-printer preset; colour is not a preset -- New nozzle size → the model's `nozzle_diameter` list extended, a variant with a matching - `printer_variant`, and at least one process listing that variant. -- `default_print_profile` is one exact name (not a `;` list), and that process's resolved - compatibility list or condition includes this printer. +No presets that differ only by colour: `filament_id` identifies a product, and the colour comes from the +spool at runtime. An all-printer library product is a ` @System` shim with an empty +`compatible_printers` ([colour](filament-profiles.md#colour-is-a-runtime-property)). + +*Why:* per-colour presets pass every check, so this is a review call. + +## 7. Model ↔ variant ↔ process consistency + +- A new nozzle size → the model's `nozzle_diameter` list extended, a variant with a matching + `printer_variant`, and at least one process listing that variant. Every size in the model's list has a + variant (unchecked). +- `default_print_profile` is one exact name (not a `;` list), and that process's resolved compatibility + list or condition includes this printer. - `default_filament_profile` is an array of names that exist. +- Each variant of the model has at least one compatible entry in the model's `default_materials`. -*Why:* an unlisted `printer_variant` is a hard bundle-load failure. Default process selection is -weaker: the sweep attempts the named default, then updates compatibility and rejects generic Default -fallbacks. Another compatible process can conceal a bad reference, so inspect it even after a pass. +*Why:* an unlisted `printer_variant` is a hard bundle-load failure. Default process selection is weaker: +the sweep attempts the named default, then updates compatibility and rejects generic Default fallbacks, +so another compatible process can conceal a bad reference. Inspect it even after a pass. -## 7. Types and spellings +## 8. Types and spellings Every value a string or an array of strings; `filament_type` an array; `instantiation` the string -`"true"`/`"false"` — golden rule 7. Check index metadata and model `nozzle_diameter` especially; -wrong types there can abort loading for **every** vendor. +`"true"` / `"false"`; custom G-code one string, never an array of lines ([SKILL.md rule 5](../SKILL.md#rules)). +Check index metadata and model `nozzle_diameter` especially: wrong types there can abort loading for +**every** vendor. The part only a reviewer can do: check new setting keys against `src/libslic3r/PrintConfig.cpp`. A -misspelled key is silently discarded (rule 8), the single most common way a profile edit does nothing -while CI stays green. +misspelled key is silently discarded ([rule 6](../SKILL.md#rules)), the single most common way a profile +edit does nothing while CI stays green. -## 8. Blast radius of a base edit +## 9. Blast radius of a base edit -A change to `fdm_*_common.json` reaches every child at once. Ask which presets it touches — several -reverts in this repo are exactly this (`41d1b0d3c8`, `dc491166a8`). Also check whether the edited leaf has -children of its own: Prusa, Flashforge and Elegoo all chain leaf-inherits-leaf several levels deep. +A change to `fdm_*_common.json` or any other base reaches every child at once. Ask which presets it +touches: several reverts in this repo are exactly this (`41d1b0d3c8`, `dc491166a8`). Also check whether +the edited leaf has children of its own: a bundle may chain leaf-inherits-leaf several levels deep. A +newly added base that nothing inherits is dead weight, and a dangling +`compatible_printers` inside a base is reported only through a child that inherits it unchanged. A diff +that only moves values between presets and bases must leave every selectable preset loading what it +loaded: ask for the `compare` result ([shared bases](shared-bases.md#nothing-loads-differently)), and +check each new base against the [balance rules](shared-bases.md#balance). -## 9. Do the numbers make sense for the nozzle? +## 10. Do the numbers make sense for the nozzle and material? -Check resolved widths and layer heights against the nozzle, and flow limits / pressure advance -against the actual hardware and material. The patterns in [process-profiles.md](process-profiles.md) -are examples, not mandatory values; [filament-profiles.md](filament-profiles.md) explains what to -revisit for a nozzle change. A cloned preset's unchanged MVS needs particular scrutiny. +Check resolved widths and layer heights against the nozzle, temperatures against the material (PLA +values under an ASA name print wrong), and flow limits / pressure advance against the actual hardware +and material. The patterns in [process-profiles.md](process-profiles.md#values-to-review-per-nozzle) +are examples, not mandatory values; [filament-profiles.md](filament-profiles.md#tuning-per-nozzle-and-per-variant) +explains what to revisit for a nozzle change. A cloned preset's unchanged volumetric speed needs +particular scrutiny. Settings tuned for real hardware cannot be verified by reading the diff. Say so rather than approving numbers nobody measured. -## 10. Asset references (not checked anywhere) +## 11. Plate temperatures + +A filament sets the plate temperature for every plate the printer plausibly has, as its siblings do; +`textured_cool_plate_temp` is the one most often forgotten +([twelve keys](filament-profiles.md#bed-temperature-is-twelve-keys-not-one)). + +## 12. Asset references (not checked anywhere) `bed_model`, `bed_texture`, `hotend_model` and `_cover.png` exist under -`resources/profiles//`. Broken references already ship; nothing checks them. +`resources/profiles//`, in exact case. Nothing checks them. -## 11. `default_materials` (checked by CI) +## 13. `default_materials` and `default_filament_profile` (checked by CI) -`check` fails on a `default_materials` / `default_filament_profile` name that resolves to no system -filament, so a dangling entry no longer reaches review. When compatibility moves between profiles of a -product, the machine's `default_filament_profile` and the model's `default_materials` must be repointed at -the most specific profile that still covers the variant, dropping generic entries that no longer apply — -the same [specificity rule](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product) -applies when adding or fixing defaults. Scope the run while working on one vendor: +`check` fails on a `default_materials` / `default_filament_profile` name that matches no filament file, +and `validate_system` on a variant with no compatible system filament in `default_materials`, so a +dangling entry no longer reaches review. When compatibility moves between profiles of a product, the +machine's `default_filament_profile` and the model's `default_materials` must be repointed at the most +specific profile that still covers the variant, dropping generic entries that no longer apply; the same +[specificity rule](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product) applies +when adding or fixing defaults. Scope the run while working on one vendor: ```bash python3 scripts/orca_profile_tool.py check --vendor "" # py -3 on Windows ``` -## 12. Per-extruder vector lengths (not checked) +## 14. Per-extruder vectors (not checked) and variant arrays (widths and layout checked) -One entry per extruder for the plain per-extruder vectors; the `printer_options_with_variant_1` keys are -sized to `printer_extruder_variant` instead. A wrong length is silently padded — repeating the **first** -value, not the last — or truncated. The two sizing families and the worked cases are in +One entry per extruder for the plain per-extruder vectors; the variant sets are sized to the variant +length, `len(printer_extruder_variant)` or one per extruder when the resolved preset has no layout (a +per-extruder difference in those keys still needs the layout, since the loader keeps only the +first value of a list-less printer's arrays). A wrong length is silently padded, repeating the **first** +value, not the last, or truncated. The two sizing families and the worked cases are in [machine-profiles.md](machine-profiles.md#multi-extruder-idex-and-tool-changers). -## 13. Non-default processes get no slice coverage +`check` reports a variant array of any type that is not exactly the `variant length × stride` width +of the selectable preset that writes it, one value included, as an error whatever the values; +`check --strict` also reports one that reaches a selectable preset at another width. A base is not +judged on its own. On a machine it +also reports layout keys that disagree: `printer_extruder_variant` / `printer_extruder_id` not the +flattening of `extruder_variant_list`, a variant without its extruder's `extruder_type` prefix, a +`default_nozzle_volume_type` the extruder does not list, a list of several variants without the pair, a +pair without the list that puts several variants on one extruder. On a machine or a process, an id +array, written or inherited, whose length differs from its variant list is an error; the id and +layout rules judge the composed preset without `--strict`. Two layout findings are warnings: a +pair without the list that `single_extruder_multi_material` off would replace at load, and a process +without `print_extruder_id` whose variants repeat. The full rules are in +[variant arrays](validation.md#variant-arrays). `check_variant_names` separately holds every variant +string, `extruder_type`, `nozzle_volume_type` and `default_nozzle_volume_type` to the engine's enums +in every bundle, BBL included, failing on a dead variant, a legacy spelling and a variant list that +names one variant twice ([variant names](validation.md#variant-names)). + +On a multi-variant printer, still check by hand: + +- that a new variant's values sit at its variant index (machine limits as a (normal, silent) pair at + `2 × index`) in every file of the chain that restates the key, `include` templates included; +- that each process lists every (extruder id, variant) pair its printers can select; +- that no array was widened on a base with a shorter variant list: the loader cuts it before the + children inherit it ([composition](extruder-variants.md#padding-truncation-and-composition)), and + `check`, even `--strict`, composes without that cut, so it passes; +- that only keys in [the four sets](extruder-variants.md#the-four-key-sets) carry per-variant values; +- that the High Flow variants carry measured values rather than copies + ([checking and testing](extruder-variants.md#checking-and-testing)). + +## 15. Non-default processes get no slice coverage `validate_slice` starts from printer defaults; it does not enumerate every process. Slice a new or -changed non-default tier explicitly with its intended printer. - -## 14. Housekeeping worth a nit, not a block - -`"from"` other than `"system"` (the preset-bundle loader ignores it, though the CLI's config-file loader -rejects anything but `system`/`user`/`User`), `printer_settings_id` copied from another -vendor, and a filename that disagrees with the preset's `name` (common; the loader keys off `name`). - -## 15. Cross-platform filenames and paths (not checked) - -Check for Windows-invalid characters, reserved device names, trailing path-component spaces/dots, -and case mismatches in `sub_path` or asset paths. See [cross-platform paths](validation.md#cross-platform-paths). +changed non-default tier explicitly with its intended printer +([on a copy of the tree](validation.md#checking-a-copy-of-the-tree)). ## 16. Do the preset names follow the conventions? -Check **every newly added profile and intentional name change**, including models and bases, -against [the naming conventions](naming.md#checking-names). Preserve shipped names during -ordinary tuning; renaming a shipped selectable preset requires the migration in item 4. +Check **every newly added profile and intentional name change**, including models and bases, against +[the naming conventions](naming.md#checking-names): no printer model in a process quality position, no +target label or base name left over from a copied preset, the bundle's established style. Preserve +shipped names during ordinary tuning; renaming a shipped selectable preset requires the migration in +item 4. -*Why:* CI checks name uniqueness, but does not enforce the naming conventions. Catch naming -mistakes before the names ship and existing projects depend on them. +*Why:* CI checks name uniqueness, but does not enforce the naming conventions. Catch naming mistakes +before the names ship and existing projects depend on them. + +## 17. Cross-platform filenames and paths (not checked) + +Check for Windows-invalid characters, reserved device names, trailing path-component spaces or dots, +and case mismatches between `sub_path` or asset references and the files on disk. See +[filenames and paths](naming.md#filenames-and-paths). + +## 18. Housekeeping worth a nit, not a block + +`"from"` other than `"system"` (the bundle loader ignores it, though loading the file as a CLI config +rejects anything but `system` / `user` / `User`), `printer_settings_id` copied from another vendor, +redundant overrides that restate the parent's value, siblings that each repeat a value their base could +hold ([shared bases](shared-bases.md)), and a filename that disagrees with the preset's +`name` (the loader keys off `name`). --- ## Reporting the review -A finding is: **one defect**, its file, what breaks at runtime or in CI, and the fix. Split independent -defects into separate findings even when they live in one file — five id problems in one bullet get one -fix and four survivors. +A finding is **one defect**: its file (or quoted lines), what breaks at runtime or in CI, and the fix. +Split independent defects into separate findings even when they live in one file: five id problems in +one bullet get one fix and four survivors. Say which findings `check` or the validator reports and which +only a reader catches: a missing version bump, a misspelled key and wrong temperatures pass CI, so a +contributor who only reruns the tools fixes what CI flags and resubmits the rest. Severity discriminates only if it is earned: | Severity | Means | | --- | --- | | blocker | the bundle fails to load, or a preset is unreachable at runtime | -| major | CI fails, or existing users lose a preset | -| minor | wrong-but-working: dead keys, `from`, naming, redundant overrides | +| major | CI fails, existing users lose a preset, or a value prints wrong while CI stays green (PLA temperatures under an ASA name; a misspelled key whose intended value differs from the inherited one) | +| minor | wrong but working: redundant or dead keys that change nothing, `from`, naming | -Compute every number and id (`orca_profile_tool.py`, a scripted count) or omit it — one invented count -makes a reader stop trusting the right ones. Report a command's result only if you ran it. +Compute every number and id (`orca_profile_tool.py`, a scripted count) or omit it: one invented count +makes a reader stop trusting the right ones. Report a command's result only if you ran it. End with a +verdict: can it merge as it stands? diff --git a/.claude/skills/orca-profiles/references/shared-bases.md b/.claude/skills/orca-profiles/references/shared-bases.md new file mode 100644 index 0000000000..500cd34006 --- /dev/null +++ b/.claude/skills/orca-profiles/references/shared-bases.md @@ -0,0 +1,254 @@ +# Shared bases + +Use this when drafting several presets at once, after `fix-variant`, or when sibling presets repeat the +same values. Each value is written once, on the base of the group it is true for, and a selectable +preset holds its identity and what makes it different. The work has two halves: choosing the groups, +which is judgment, and moving the values, which must leave every preset loading exactly what it loaded +before. + +## When + +- **Drafting** a printer family, a quality ladder or a product line: place each setting at its + [level](#levels) before writing any preset, then write the presets as overrides + ([Rule 7](../SKILL.md#rules)). +- **After `fix-variant`.** It resizes each array in the selectable preset that writes it and never + moves or deletes a value ([variant arrays](validation.md#variant-arrays)). A family whose presets all + wrote one value now repeats the widened array in every preset, and a preset that restated what it + inherits now restates it wider. +- **Converting full copies**: a machine that inherits nothing, or a filament that restates fifty-plus + keys, is the style to move away from ([filament style](filament-profiles.md#style)). + +Out of scope: + +- **BBL.** Its profiles are synced from BambuStudio: a restructure is overwritten by the next sync and + makes every later sync diff unreadable. Fix BBL values in the file that holds them. +- **OrcaFilamentLibrary bases for one vendor's values.** A library base reaches every bundle's + filaments. Put a vendor's shared values on a base in its own bundle (a product `@base`, or a vendor + base that inherits the library's), and change a library base only for a value true of every filament + below it in every bundle. +- **Families the change does not touch.** Restructure the presets you are already changing; a + bundle-wide pass is a change of its own. Commit a restructure without any value change, so `compare` + alone verifies it. + +## Nothing loads differently + +A restructure changes where values are written, never what a selectable preset loads. Presets keep +their `name` and `setting_id`, and user presets and projects refer to a system preset by name and store +their own changes against what it loads, so an unchanged load changes nothing for users. Prove it with +the bundled helper, from the repository root (every subcommand takes `--profiles ` to work on a +copy of the tree): + +```bash +python3 .claude/skills/orca-profiles/scripts/shared_settings.py snapshot # before any edit +python3 .claude/skills/orca-profiles/scripts/shared_settings.py compare # after: "0 difference(s)", exit 0 +``` + +`snapshot` records every selectable preset of every bundle as the loader stores it: the parent's stored +config, each `include` at the width its file wrote, the preset's own keys, then every variant array +resized to the preset's own variant list ([composition](vendor-bundle.md#inherits-and-include)). It +models the step `check` does not see: a base is stored after its own resize, so an array wider than a +base's list reaches its children cut. It also leaves out what the loader reads from each file and never +hands down (`name`, `type`, `from`, `instantiation`, `inherits`, `include`, `setting_id`, +`renamed_from`, `description`, `version`, `url`, `is_custom_defined`), so those keys never move to a +base. Nor does it record `print_settings_id`, `printer_settings_id` or `filament_settings_id`: the app +replaces them with the selected presets' names before slicing, so a file's value never counts. Delete +them from the presets you restructure rather than moving them to a base. + +It does not know the built-in defaults, so `compare` lists a key written on one side only (no file of +the preset's chain writes it on the other) apart from the differences, and exits 1 for either. A +difference is a value the edit changed: undo it, or make it a separate, deliberate change. A one-sided +key is no change only when its written value is the option's default in `PrintConfig.cpp`: confirm +each, as when a preset that loaded the default by leaving a key out must now write it +([Balance 5](#balance)). A value equal to the default needs writing nowhere when no base above writes +another: delete it from the presets rather than moving it, and confirm the one-sided keys. + +## Levels + +A base stands for a level of the vendor's catalogue, and a setting lives at the level that determines +it. The test for a shared value: if it had to change for one preset of the group, should it change for +all of them? If yes, it is the group's and goes on the group's base. A value that is only equal today +(two unrelated printers with the same acceleration) stays in each preset: a base built on coincidence +is later edited for one preset and silently changes the others. For a default with exceptions +([Balance 5](#balance)), ask the question of the presets that inherit the default. + +The tables give each setting's usual level; the test decides for a given bundle: where each toolhead +(Bowden or Direct Drive) has its own default filament, `default_filament_profile` follows the +toolhead, not the nozzle. Levels run +coarse to fine, and a chain need not visit every level: each preset or base inherits the next coarser +level that has a base. + +| Machine level | Base | Settings it determines | +| --- | --- | --- | +| Vendor | `fdm_machine_common`, `fdm__common` | the vendor's defaults for every printer | +| Firmware | `fdm_klipper_common`, `fdm_marlin_common` | `gcode_flavor`, G-code that calls the firmware's macros (layer change, pause, filament change), `host_type`, `print_host`, the thumbnail format | +| Hardware family: models that share a frame, motion system, toolhead or extruder layout | `fdm___common` (`fdm_qidi_x3_common`, `fdm_machine_eryone_ER20_common`) | the `machine_max_*` limits, `extruder_clearance_*`, the toolhead's retraction where every nozzle shares it, `z_hop` and wipe, fitted hardware such as `auxiliary_fan`, the extruder count and per-extruder vectors, the variant layout ([Printer rule 2](extruder-variants.md#printer-machine)) | +| Model: one `machine_model`, which for an IDEX printer includes its mode | the default-nozzle preset where the bundle hangs its other nozzle presets off it; otherwise `fdm___common` | `printable_area`, `printable_height`, `bed_exclude_area`, the model's start G-code, a COPY or MIRROR mode's settings | +| Nozzle: the selectable preset | none | `printer_model` and `printer_variant`, which name the preset's model and nozzle and stay in every preset as the tree writes them; `nozzle_diameter`, `min_layer_height`, `max_layer_height`, `default_print_profile`, `default_filament_profile`, retraction the vendor tunes per nozzle | + +A family may split once more, into toolhead or revision groups that exist only within it: +`fdm___common` → `fdm___mk1_common`. A split that crosses another axis is not a +level: when every controller comes with every toolhead, a toolhead base under each controller base +repeats the same values in each ([Balance 6](#balance)). + +| Process level | Base | Settings it determines | +| --- | --- | --- | +| Vendor | `fdm_process_common`, `fdm_process__common` | strategy: seam, wall order, infill and support patterns | +| Printer family or variant layout | `fdm_process___common` (`fdm_process_arena_common`, BBL's `fdm_process_dual_common`) | speeds, accelerations and jerk of that motion system; the variant layout ([Process rule 4](extruder-variants.md#process)) | +| Layer height × nozzle | `fdm_process___nozzle_` (BBL's `fdm_process_single_0.20`) | `layer_height`, line widths, shell layers, speeds scaled to the layer | +| Quality × printer: the selectable preset | none | `compatible_printers`, and what is unique to that combination | + +| Filament level | Base | Settings it determines | +| --- | --- | --- | +| Material | `fdm_filament_` in OrcaFilamentLibrary, shared by every bundle | material defaults | +| Product | ` @base` | `filament_id` (minted here, [ids](ids.md)), `filament_vendor`, `filament_type`, density, cost, the product's temperatures and cooling | +| Printer or nozzle tune: the selectable preset | none | `compatible_printers` (always in its own file, [Rule 9](../SKILL.md#rules)), volumetric speed, flow ratio, pressure advance and retraction measured on that printer | + +**Equal where they must differ is a copy.** A key that follows a finer level, such as the layer-height +limits and line widths that follow the nozzle diameter or `printable_area` that follows the bed, never +moves above that level. When presets that differ in it carry the same value, the value was copied: leave +it in the presets and report it (the [worked example](#worked-example-an-idex-family) has one). + +## Balance + +1. **One group, one base; use the existing one first.** A base is the home of the presets below it, + whatever its name. In a bundle whose presets are all one family, the vendor base is the family base, + so the family's values go there. In a bundle that hangs the other nozzles off the default-nozzle preset, that preset is the model's home. + Never create a base whose presets are exactly its parent's. Where two existing bases already serve + the same presets (a copied `fdm_machine_common` above the vendor's own base), the finer one is the + home, and merging the pair is a change of its own. Moving a key into an existing home adds no file. + A base value that no preset below it loads is dead: replace it with the group's value when there is + one; otherwise leave it and report it, since a future preset would inherit it. +2. **A new base must stand for a level and pay for itself.** Its file costs five metadata keys and an + index entry, so create it only when it takes `k` keys off `n` selectable presets with + `(n − 1) × k > 6`, where a custom G-code value counts as one key per G-code line: what it removes + must outnumber what it adds. A model with two nozzles that share three short keys keeps them in both. +3. **No ad-hoc bases:** never a base for presets that merely agree (the ones with 0.8 mm retraction), + and never a base with one preset below it. +4. **Keep every selectable preset within four ancestors**, selectable parents included. When a level would push a preset past that, fold it into the level above or leave + its keys in the presets. +5. **A default with exceptions.** A value that only some presets below a shared base load moves to that + base, whichever axis it follows, when two conditions hold. More presets load it than any other value + (on a tie the key stays in the presets), and `w − a > 1`, where `w` presets drop their copy and `a` + presets that take the key from the base and load another value, the built-in default included, must + now write theirs. Presets that write another value keep it and are unaffected. The base then holds + the group's default, and the exceptions stay visible in their own files. +6. **One chain; the other axes stay in the presets.** `inherits` follows one axis. When presets vary + along several (bed size × controller × toolhead), first fill the existing homes by + rules 1 and 5. Then give new bases to the axis whose bases pay most: sum rule 2's count over its + bases, less the keys a re-parented preset must now write because it no longer inherits them from its + old parent; on a tie, follow the layering the bundle already has. Leave the other axes' keys in the + presets, and never repeat one axis's bases under each group of another. Outside BBL, whose synced + presets need theirs, add no `include` template for a second axis: the loader reads `include` only + since #15869 (2026-09-25), and an app that predates it ignores the key, so the template's settings + never reach the preset. + +Name a new base after its level ([base names](naming.md#bases)). The name must be unique in its bundle +and must not equal a selectable preset's: two such presets load silently and the first in the index wins +([uniqueness](naming.md#uniqueness)). + +## Restated values + +`candidates` lists every key a file writes that it would load unchanged without writing it. Delete it +when the value is what the presets below the base that supplies it share: more of them load it, +written or inherited, than any other value. A family that restates machine limits, clearances and +G-code every other printer of the bundle loads from `fdm_klipper_common` drops its copies. When most +presets below that base load another value, the match is a coincidence: keep the key, and move it to +the level of the presets that share it. Keys of the nozzle level stay in the preset in +either case. + +After a restructure the report still lists keys that are right where they are: the nozzle-level keys +each preset keeps, and arrays a list-less multi-extruder base writes at its presets' width for +`check --strict`. + +## Variant arrays on a base + +- The loader stores a base with its variant arrays resized to the base's own variant list, one variant + when it writes none, so an array on a narrower base reaches its presets as its first value, padded. + Move a variant array to a base only when the base declares the presets' variant list (and, for a + machine or process, their ids), moving the layout keys with it as + [Printer rule 2](extruder-variants.md#printer-machine) and [Process rule 4](extruder-variants.md#process) + ask; or when the presets load its first value anyway: every value is equal, or the presets are + list-less machines, which the loader cuts to one variant. `compare` catches a cut. +- Write the array on the base at the width of the presets it serves, their `N` + ([sizing equation](extruder-variants.md#sizing-equation)), so `check --strict` judges the right width + where it reaches them. When the presets below a base need different widths (single- and + dual-extruder models on one base), leave the array in the presets, or on bases that each serve one + width. +- On a list-less multi-extruder family base, declare the extruder count: `nozzle_diameter` and the other + per-extruder vectors at one entry per extruder. The base then has its presets' width, and + `fix-variant --strict` writes an array that reaches the presets at another width into the base once, + instead of into every preset. +- Deleting a restated variant array leaves the preset on the inherited array. Plain `check` accepts + that; `check --strict` reports it when the inherited width differs, which is why a bundle held to + `--strict` restates the array at each preset's width. + +## Procedure + +1. **Snapshot** the tree before any edit, `fix-variant` included. After `fix-variant`, run `compare`: a + difference is a value its padding changed (it repeats the last value, the loader the first). Set that + value deliberately, then snapshot again as the baseline for the restructure. +2. **List the candidates:** + + ```bash + python3 .claude/skills/orca-profiles/scripts/shared_settings.py candidates --vendor "" --type machine + python3 .claude/skills/orca-profiles/scripts/shared_settings.py candidates --vendor "" --type machine --group-by printer_model + ``` + + It prints the [restated values](#restated-values), then, per base, the keys every selectable preset + below it loads with one value and how many of those presets write it themselves, and under + `default with exceptions` the values that pass [Balance 5](#balance), with `w` and `a`. With + `--group-by ` it groups the selectable presets by that key's value instead and names each + group's nearest common base, where a new base would go: `printer_model` for models, `gcode_flavor` + for firmware, `extruder_type` or `default_filament_profile` for toolheads, `filament_id` for + filament products, `layer_height` for processes. The report is evidence, not a plan: it cannot tell + a shared value from a coincidence or a copy. +3. **Decide each key** by [Levels](#levels), [Balance](#balance) and + [Restated values](#restated-values): delete the restatements of shared values, move group values up + to the group's home, and create only the bases that pay. +4. **Edit.** Each new base gets `"type"`, `"name"`, `"from": "system"`, `"instantiation": "false"`, no + `setting_id`, and `inherits` set to the presets' old parent. Point the presets' `inherits` at it and + delete the moved keys from them. Bump the version, then run `normalize`, `update-index` (it orders + parents first) and `generate-id --dry-run`, which must write nothing: bases take no id and presets + keep theirs. +5. **In a bundle held to `--strict`, run `fix-variant --strict` now**, so it writes into the new bases. +6. **Verify.** `compare` prints `0 difference(s)`, and every one-sided key it lists is a default. + `check` reports no error it did not report before, and neither does `check --strict` where the bundle + passes it. Then run the [authoring checks](../SKILL.md#creating-or-modifying-a-profile). +7. **Report** each base added (name, level, presets below it, keys it holds), the keys left in presets + and why, the copies found, and the `compare` result. + +## Worked example: an IDEX family + +A Klipper bundle's IDEX family has 36 selectable machines (bed size 300, 400 or 500 × normal, COPY or +MIRROR mode × 0.4, 0.5, 0.6 or 0.8 nozzle) that all inherit `fdm_klipper_common` directly and write 49 +keys each. `fix-variant` has widened their retraction arrays to two values and their machine limits +to four. + +- **Restated.** All 36 restate 10 values that every other printer of the bundle loads from + `fdm_klipper_common`: three machine limits, the three clearances, wipe, `retract_before_wipe`, and the + layer-change and pause G-code. Delete them. +- **Family.** All 36 load one value for 24 more keys: the other machine limits, `extruder_offset`, + retraction, `z_hop`, `single_extruder_multi_material`, `manual_filament_change`, the remaining G-code + except the start G-code, and thumbnails. A new family base, `fdm___idex_common`, + holds them, plus `nozzle_diameter` `["0.4", "0.4"]` for the extruder count: at least + `(36 − 1) × 24 = 840`. +- **Model.** Each `printer_model` (a bed size in one mode) has four nozzle presets that share + `printable_area`, `printable_height` and a three-line `machine_start_gcode`: `(4 − 1) × 5 = 15`, so + one base per model, nine in all. The family does not hang its other nozzles off a default-nozzle + preset, so the model level here is a base. +- **A coincidence.** The twelve 500 presets' `printable_height` 500 equals `fdm_klipper_common`'s, but + every preset of the bundle writes its own height and 300 is the most common. The 500 is the base's + leftover, not a shared value, so it stays on the model bases. +- **A copy.** In COPY and MIRROR mode, every nozzle of a model carries the 0.4 nozzle's + `min_layer_height`, `max_layer_height` and `retract_lift_below`: 0.06, 0.3 and 0.2 on the 0.8 nozzle, + where normal mode has 0.12, 0.5 and 0.3. `candidates --group-by printer_model` lists the first and + last as shared by the model, and `max_layer_height` as restated from `fdm_klipper_common`, whose value + is also 0.3. They follow the nozzle, so they stay in the presets and are reported for tuning. +- **Nozzle.** Each preset keeps `printer_model`, `printer_variant`, `nozzle_diameter`, + `min_layer_height`, `max_layer_height` and `retract_lift_below` beside its metadata. +- **Result.** 36 full presets become 36 short ones on 10 new bases. `compare` reports 0 differences, + `check --vendor ""` passes as before, and `generate-id --dry-run` writes nothing. + `check --strict` reports more errors than before, because the deleted variant arrays now reach the + presets at `fdm_klipper_common`'s one value. `fix-variant --strict` writes those arrays into the + family base alone, after which `check --strict` passes for the family and `compare` still reports 0 + differences. diff --git a/.claude/skills/orca-profiles/references/validation.md b/.claude/skills/orca-profiles/references/validation.md index c23b555f49..b5c647f839 100644 --- a/.claude/skills/orca-profiles/references/validation.md +++ b/.claude/skills/orca-profiles/references/validation.md @@ -1,8 +1,8 @@ # Validating profiles ```bash -./scripts/check_profile.sh # everything CI runs -./scripts/check_profile.sh --vendor "" # fast loop +./scripts/check_profile.sh # everything CI runs +./scripts/check_profile.sh --vendor "" # development loop ./scripts/check_profile.sh profile_tool validate_slice # named checks only ``` @@ -12,153 +12,316 @@ scripts\check_profile.bat -Vendor "" scripts\check_profile.bat profile_tool validate_slice ``` -`check_profile.bat` is a shim around `check_profile.ps1` — same checks, same order, same logs; -the flags take PowerShell spellings (`-Vendor`, `-ProfilesDir`, `-Validator`, `-Download`, `-Refresh`, -`-WorkDir`, `-LogLevel`) and positional check names are unchanged. `-p`, `-v` and `-l` are aliases, so -`-v Elegoo -l 2` reads the same on both platforms. It passes `-ExecutionPolicy Bypass` because a +`check_profile.bat` is a shim around `check_profile.ps1`: same checks, same order, same logs. Its flags +take PowerShell spellings (`-Vendor`, `-ProfilesDir`, `-Validator`, `-Download`, `-Refresh`, +`-WorkDir`, `-LogLevel`), and positional check names are unchanged. `-p`, `-v` and `-l` are aliases, +so `-v Elegoo -l 2` reads the same on both platforms. It passes `-ExecutionPolicy Bypass` because a default Windows client refuses to run a checked-out `.ps1` at all. The `.ps1` finds Python itself, probing `py -3`, then `python`, then `python3`; run the tool by hand with `py -3` for the same reason. -Every check in the run happens even after an earlier one fails; the script exits non-zero if any did, and writes -`logs/.log` plus, on failure, `pr_comment.md` under a per-user cache dir — the same report CI posts on the PR. -That dir is `~/Library/Caches/orca-profile-check` on macOS, `${XDG_CACHE_HOME:-~/.cache}/orca-profile-check` on Linux -and `%LOCALAPPDATA%\orca-profile-check` on Windows; it is named apart from OrcaSlicer's own per-user dirs and sits -outside the checkout, so every worktree shares one copy. `--work-dir` / `-WorkDir` overrides it. A stale `.lock` -there after a crash must be removed by hand. +Every check runs even after an earlier one fails; the script exits non-zero if any failed, and writes +`logs/.log` plus, on failure, `pr_comment.md` (the same report CI posts on the PR) under a +per-user cache dir: + +| Platform | Cache dir | +| --- | --- | +| macOS | `~/Library/Caches/orca-profile-check` | +| Linux | `${XDG_CACHE_HOME:-~/.cache}/orca-profile-check` | +| Windows | `%LOCALAPPDATA%\orca-profile-check` | + +It is named apart from OrcaSlicer's own per-user dirs and sits outside the checkout, so every worktree +shares one copy and each run overwrites its `logs/`. `--work-dir` / `-WorkDir` overrides it. + +When other worktrees or agents may run checks too, pass `--work-dir ` from the start +and capture the console output yourself: the shared `logs/` can belong to another run by the time you +read them. With `--work-dir`, also pass `--validator` pointing at the cached nightly, so the new dir +does not download it again: + +| Platform | Cached validator | +| --- | --- | +| Linux | `/validator/OrcaSlicer_profile_validator` | +| macOS | `/validator/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator` | +| Windows | `\validator\OrcaSlicer_profile_validator.exe` | + +Copying the cached `profile-fixtures/` into the new dir reuses the fixture archives; the fixture +`manifest.json` is still downloaded on every run, so `validate_custom` needs the network either way. +`another run is using ` means a live run holds `/.lock`: leave it and use your own +`--work-dir`. Only a `.lock` with no `check_profile` process alive is a crash leftover; delete it by +hand. ## The five checks | Check | Command it runs | Catches | | --- | --- | --- | -| `profile_tool` | `python3 scripts/orca_profile_tool.py check` | index coverage **both ways**, preset-name collisions, files `normalize`/`update-index` would still rewrite, duplicate JSON keys, filament `compatible_printers`, `filament_type` array, conflict keys, id length, **all `setting_id` and `filament_id` rules** | -| `validate_system` | `validator -p resources/profiles -l 2` | load errors, missing filament `compatible_printers`, dangling `inherits`/`compatible_*`, duplicate `filament_id` per printer | -| `validate_slice` | `validator -p … -s -l 2` | custom G-code expansion, unresolvable printer defaults | -| `validate_filament_subtypes` | `validator -p … -l 2 -f` | nothing extra — see below | -| `validate_custom` | `validator -p -l 2` | a shipped preset name that a past release offered no longer resolving | +| `profile_tool` | `python3 scripts/orca_profile_tool.py check` | index coverage **both ways**, preset-name collisions, files `normalize` / `update-index` would still rewrite, duplicate JSON keys, filament `compatible_printers`, `filament_type` array, conflict keys, variant strings and array widths and layout keys, dangling `default_materials`, id length, **all `setting_id` and `filament_id` rules** ([below](#orca_profile_toolpy-check)) | +| `validate_system` | `validator -p resources/profiles -l 2` | load errors, missing filament `compatible_printers`, dangling `inherits` / `compatible_*`, duplicate `filament_id` per printer (`Ambiguous AMS filament match`), printer defaults that name no compatible system filament | +| `validate_slice` | `validator -p … -s -l 2` | custom G-code expansion and unresolvable printer defaults, by slicing | +| `validate_filament_subtypes` | `validator -p … -l 2 -f` | nothing extra; see below | +| `validate_custom` | `validator -p -l 2` | a shipped preset name that a past release offered no longer resolving | -**`-f` is a no-op.** It is declared `po::bool_switch()->default_value(true)`, so the duplicate-`filament_id` -check runs whether or not you pass it — `validate_system` already fails on duplicates. The binary's own -`--help` ("Off unless this flag is present") does not reflect that default. +**`-f` is a no-op.** It defaults to on, so the duplicate-`filament_id` check runs whether or not you +pass it, and `validate_system` already fails on duplicates. The binary's own `--help` ("Off unless this +flag is present") does not reflect that default. -### `validate_custom` — the backward-compatibility gate +**A `--vendor` run reads differently from CI.** The validator's `-v` loads that vendor plus +OrcaFilamentLibrary and nothing else, so every library tune whose `compatible_printers` names another +vendor's printers fails `validate_system`, `validate_filament_subtypes` and each `validate_custom` +fixture with thousands of `references unknown compatible_printers "Bambu Lab …"` lines. Under +`--vendor`, `profile_tool` and `validate_slice` are the meaningful results; for the other three, filter +the log for your vendor's files and treat only those lines as findings. The unscoped run is the CI +result; run it before the PR. -Downloads one fixture archive per past release (v1.9.0 onwards) of *generated mock* user presets — -a `__orca_test` copy of every system preset that -release shipped, cut with the validator's own `-g 1` mode — unpacks each over a copy of the current tree -and loads it. Each entry holds only `inherits` plus a canned diff, so the one failure it adds over -`validate_system` is a shipped preset name disappearing. (The whole current tree sits under each fixture, -so every `validate_system` error fails it too.) This is what makes a rename or an -`instantiation` flip a CI failure rather than just a user complaint, and the reason `renamed_from` is -mandatory. +### `validate_custom`: the backward-compatibility gate + +It downloads one fixture archive per past release (v1.9.0 onwards) of *generated mock* user presets: a +`__orca_test` copy of every system preset that release shipped, cut with the +validator's own `-g 1` mode. It unpacks each over a copy of the current tree and loads it. Each entry +holds only `inherits` plus a canned diff, so the one failure it adds over `validate_system` is a shipped +preset name disappearing. This is what makes a rename, a deletion or an `instantiation` flip a CI +failure rather than just a user complaint, and the reason `renamed_from` is mandatory. + +The whole current tree sits under each fixture, so every `validate_system` error fails +`validate_custom` too: fix `validate_system` first. Under `--vendor` it copies only the top-level index +files, `/` and `OrcaFilamentLibrary/`, and picks fixtures by the index's display `name` +(`Bambulab` for `BBL`), not the file stem; fixture presets without that prefix are covered only by an +unscoped run, and it warns `validate_custom checked nothing` when none match. ### `validate_slice` -Slices a two-colour cube on every instantiable printer in the tree, sequentially, forcing the prime tower. -It selects `default_print_profile` and the first `default_filament_profile`, then updates compatibility; -that update can select a different compatible preset. Confirm the intended defaults yourself rather -than treating a passing sweep as proof that those exact presets were sliced. -A printer fails if it cannot be selected, falls back to a Default preset, throws, produces no g-code, or -emits no `CP TOOLCHANGE START`. It cannot be scoped to a filament-only vendor -(`No instantiable printer presets found for vendor OrcaFilamentLibrary`); `check_profile.sh` records it -as SKIP for a vendor with no `machine/` folder. +It slices a two-colour cube on every instantiable printer in the tree, sequentially, forcing the prime +tower. It selects `default_print_profile` and the first `default_filament_profile`, then updates +compatibility; that update can select a different compatible preset. Confirm the intended defaults +yourself rather than treating a passing sweep as proof that those exact presets were sliced. + +A printer fails if it cannot be selected, falls back to a Default preset, throws, produces no G-code, +or emits no `CP TOOLCHANGE START` (`change_filament_gcode` never expanded). Non-default processes and +filaments get no dedicated coverage; [slice them on a copy](#checking-a-copy-of-the-tree). In the +default set, a bundle without a `machine/` folder is recorded as SKIP; naming `validate_slice` +explicitly for it fails (`No instantiable printer presets found for vendor OrcaFilamentLibrary`). The +validator logs `[error]` lines that do not fail a check (such as `could not found extruder_type`); only +each check's PASS or FAIL counts. ## `orca_profile_tool.py check` -`check` is one subcommand of the tool that also owns -`generate-id`, `normalize`, `trim` and `update-index`; see [ids.md](ids.md) for the writing half. +`check` is one subcommand of the tool that also owns `fix-variant`, `generate-id`, `normalize`, +`trim` and `update-index`; [ids.md](ids.md#the-tool) has the writing half. -| Per vendor | Catches | -| --- | --- | -| `check_preset_name_uniqueness` | two files in one bundle claiming one type + name — indexed or not | -| `check_index_coverage` | a file on disk that no `*_list` references (**an error, not a warning**) | -| `check_name_consistency` | an index entry whose `name` disagrees with the file, or whose `sub_path` is missing | -| `check_normalized` | a file `normalize` would rewrite, and an index `update-index` would rebuild | -| `check_filament_compatible_printers` | an instantiated non-library filament with no `compatible_printers` of its own | -| `check_conflict_keys` | `extruder_clearance_radius` alongside `extruder_clearance_max_radius` | -| `check_vector_type_keys` | a vector option written as a scalar (`"filament_type": "PLA"`) | -| `check_filament_id_length` | a declared `filament_id` longer than 8 characters | -| `check_machine_default_materials` | every `default_materials` / `default_filament_profile` name resolves | -| `check_obsolete_keys` | per-key warnings for ignored options; **filament files only** | +| Catches | Scope | Function in the tool | +| --- | --- | --- | +| two files in one bundle claiming one type + name, indexed or not | per vendor | `check_preset_name_uniqueness` | +| a file on disk that no `*_list` references (**an error, not a warning**) | per vendor | `check_index_coverage` | +| an index entry whose `name` disagrees with the file, or whose `sub_path` is missing | per vendor | `check_name_consistency` | +| a file `normalize` would rewrite, an index `update-index` would rebuild | per vendor | `check_normalized` | +| duplicate JSON keys in a file | every file read | the JSON loader | +| an instantiated non-library filament with no non-empty `compatible_printers` of its own | per vendor | `check_filament_compatible_printers` | +| `extruder_clearance_radius` alongside `extruder_clearance_max_radius` | per vendor | `check_conflict_keys` | +| a scalar `filament_type` (`"filament_type": "PLA"`); the five other filament vectors `normalize` arrayifies surface as `normalize would convert to an array` | per vendor | `check_vector_type_keys`, `check_normalized` | +| a variant string the two enums cannot build (a dead variant, a legacy spelling included), a variant list naming one variant twice, an `extruder_type`, `nozzle_volume_type` or `default_nozzle_volume_type` that is not an enum name ([variant names](#variant-names)) | per vendor | `check_variant_names` | +| a variant array not exactly `variant length × stride` wide in a selectable preset that writes it (with `--strict`, also in one it reaches); machine variant layout keys that disagree; a process id array that does not pair each variant ([variant arrays](#variant-arrays)) | per vendor | `check_variant_arrays` | +| a declared `filament_id` longer than 8 characters | per vendor | `check_filament_id_length` | +| a `default_materials` name, or a `default_filament_profile` name, matching no filament file ([below](#default-material-references)) | per vendor | `check_machine_default_materials` | +| per-key warnings for ignored options, **filament files only** | per vendor | `check_obsolete_keys` | +| `setting_id` uniqueness, every `filament_id` rule, and `machine_model` names duplicated across bundles | **tree-wide, ignoring `--vendor` entirely** | `check_setting_id_uniqueness`, `check_filament_ids`, `check_machine_model_name_uniqueness` | -Tree-wide, **ignoring `--vendor` entirely**: `check_setting_id_uniqueness` and `check_filament_ids`. So a -vendor-scoped run can and does fail on another vendor's files — and it saves seconds, not minutes. +Because the id and model-name checks stay tree-wide, a vendor-scoped run can and does fail on another +vendor's files, and it saves seconds, not minutes. Unscoped, the per-vendor pass covers every bundle. The only exclusion is the stray `user/` directory -(see below); `OrcaFilamentLibrary` is held to the same rules as any vendor, its sole exemption being -that a library filament may leave `compatible_printers` empty — exactly what -`check_filament_compatible_printers` allows. `check_normalized` covers every bundle with an index. +(below); OrcaFilamentLibrary is held to the same rules as any vendor, its sole exemption being that a +library filament may leave `compatible_printers` empty. `check_normalized` covers every bundle with an +index. Notes that matter: -- Exit codes: **0** clean, **1** errors found, **2** argparse misuse. Warnings never change the exit code. -- A nonexistent `--vendor` is a hard error — `[ERROR] unknown vendor "" in `, exit 1. -- `--vendor ""` means all vendors; `check_profile.sh` relies on that. `--vendor` is repeatable. -- A **stray directory** under `resources/profiles/` still gets counted as a vendor by the per-vendor pass - and warned about (`No profiles found for vendor: at …/.json`, and the "Checked vendors" count - goes up by one). The one exception is `user/`, the validator's data dir, which an unscoped `check` - skips by name; `--vendor user` still checks and warns about it. Warnings never change the exit code. - `normalize`, `trim` and `update-index` ignore strays too — they define a bundle as *a directory with a +- Exit codes: **0** clean, **1** errors found, **2** argparse misuse. Warnings never change the exit + code. +- A nonexistent `--vendor` is a hard error: `[ERROR] unknown vendor "" in `, exit 1. +- `--vendor ""` means all vendors; `check_profile.sh` relies on that. `--vendor` is repeatable + (`check --vendor A --vendor OrcaFilamentLibrary`); `check_profile.sh` takes one. +- A **stray directory** under `resources/profiles/` still gets counted as a vendor by the per-vendor + pass and warned about (`No profiles found for vendor: at …/.json`, and the "Checked + vendors" count goes up by one): usually an emptied folder, or a `user/` left by a direct validator + run. An unscoped `check` skips `user/` by name; `--vendor user` still checks and warns about it. + `normalize`, `trim` and `update-index` ignore strays too: they define a bundle as *a directory with a matching index file*. - Each remedy is printed once for the whole run, not once per file, as a `[WARNING]` under the errors - ("2 unreferenced file(s) above: delete them, or run … update-index"). Read those lines: they name the + (`2 unreferenced file(s) above: delete them, or run … update-index`). Read those lines: they name the command that fixes the batch. -- The trailing summary always suggests `normalize`. That is right for the shape errors and misleading for - everything else — an id error needs `generate-id`, a dangling `default_materials` needs a human. +- When there are errors or warnings, the trailing summary suggests `normalize`. That is right for the + shape errors and misleading for everything else: an id error needs `generate-id`, a dangling + `default_materials` needs a human. +- Other options: `--dry-run` on every writing command, `--profiles DIR` to point any command at another + tree, `--profile-type` to narrow `normalize`, `trim` and `update-index` to one type + ([ids.md](ids.md#the-tool)). - `resources/profiles/check_unused_setting_id.py` is a legacy BBL-only diagnostic, not part of profile CI. Use `orca_profile_tool.py check` for current id validation. -### Obsolete-key diagnostics +### Obsolete keys -`check` always reports per-key warnings for obsolete options in filament profiles. -The normalization check also rejects obsolete keys across preset types; `normalize` removes them. +`check` always reports per-key warnings for obsolete options in filament profiles. Its normalization +check also rejects obsolete keys across all preset types (`normalize would remove `); `normalize` +removes them. ### Default-material references -The materials check finds `default_materials` / `default_filament_profile` entries naming a preset -that does not exist. The three authoring errors it surfaces are `,` instead of `;`, wrong case -(`@system`), and a whole `;`-joined string stuffed into one array element. +The materials check finds `default_materials` / `default_filament_profile` entries naming a preset that +does not exist. It reads each `machine/` file's own key (a model's `default_materials`, a variant's +`default_filament_profile`; a file that writes both is checked on `default_materials` only) and accepts +any `name` found in the vendor's or OrcaFilamentLibrary's `filament/` files, bases and unindexed files +included. The three authoring errors it surfaces are `,` instead of `;`, wrong case (`@system`), and a +whole `;`-joined string stuffed into one array element. Only the validator (`validate_system`) requires +an instantiated system filament that is compatible with each variant. + +### Variant arrays + +`check_variant_arrays` composes every selectable preset the loader's way (the parent, then each +`include` in order, then the file's own keys; a filament's `inherits` may fall through to +OrcaFilamentLibrary) and holds each key of [the four variant sets](extruder-variants.md#the-four-key-sets) +that the preset writes itself to exactly its `variant length × stride` +([widths](extruder-variants.md#widths)). The variant length is the length of the composed preset's +own `*_extruder_variant` list; without one, a machine's is the number of variants its +`extruder_variant_list` offers, else its extruder count (the list's default is one +`Direct Drive Standard` per extruder), and a process's or filament's is 1. Any other width is an +error, one value included and even when every value is the same. A key the preset does not write +takes what reaches it, the default or an array it inherits or includes, which the loader resizes; it +is not checked. A base is not judged on its own: what it writes counts only where it reaches a preset +that does not override it. + +`check --strict` also holds every selectable preset to its own width for each key that reaches it, +so a preset whose variants differ from those of the file its array comes from restates the array +(the error names that file). That is BBL's practice and the target for new printer-specific presets; +CI runs `check` without `--strict`. + +An id array that reaches a selectable preset, `printer_extruder_id` or `print_extruder_id`, written or +inherited, must have one entry per entry of its variant list on any printer. This rule and the +machine layout rules below judge the composed preset without `--strict`, whichever file writes the +keys. Beside a written variant list this rule reports it instead of the width +rule, so it is reported once. A process that +lists variants without `print_extruder_id` gets a **warning** when a variant repeats (every entry then +reads as extruder 1, so the repeated variant is unreachable), nothing otherwise. + +On a machine the layout keys are held to [Printer rules 1–4](extruder-variants.md#printer-machine), +every failure an error unless marked: + +- With `extruder_variant_list` written: the list has one entry per extruder, as many as + `nozzle_diameter`; every variant starts with its extruder's `extruder_type`; + `default_nozzle_volume_type` names a nozzle volume type that extruder lists; + `printer_extruder_variant` is the list flattened extruder-major and `printer_extruder_id` gives each + entry its 1-based extruder (an id array left out reads as extruder 1 everywhere, which passes when + those are the flattening's ids). Without the pair, the list may offer one variant in total. +- With the pair written and no `extruder_variant_list`: one variant per extruder at most. A pair that + `single_extruder_multi_material` off would replace with the default at load is a **warning**; a pair + the rebuild would leave as it is passes. + +It does **not** see a base's own resize: it composes at the width each file wrote, so an array wider +than a base's list, which the loader cuts before any child inherits it, passes even with `--strict` +([composition](extruder-variants.md#padding-truncation-and-composition)). Nor does it see per-extruder +vectors outside the sets (`extruder_offset`, `printer_extruder_options`, …), which no variant list +sizes. What a variant holds (a High Flow variant copied from Standard, a variant inserted at the wrong +index) is review work +([item 14](review-checklist.md#14-per-extruder-vectors-not-checked-and-variant-arrays-widths-and-layout-checked)); +whether it is a name the engine can select at all is `check_variant_names`'. + +`python3 scripts/orca_profile_tool.py fix-variant` resizes every array the width rule rejects in the +selectable preset that writes it, leaves bases alone and adds no key: extra values are dropped, missing ones +repeat the last value (the last normal/silent pair at stride 2; a lone value fills normal and silent +alike). It leaves the variant lists and id arrays to you, since they address the variants rather than +fill them. `fix-variant --strict` then also writes each key that reaches a selectable preset at +another width: into the most general file on the way down to the preset whose own width is the +preset's and whose selectable presets taking it all need that width, else into the preset itself. +Presets of every bundle count towards that agreement; `--vendor` limits the files written and +`--dry-run` previews. The loader pads with the first value where `fix-variant` repeats the last, so a +padded array need not load as before, and +trimming deletes values: when the extra values were meant as per-extruder or per-variant values, +declare the variant layout instead ([Printer rule 2](extruder-variants.md#printer-machine)) and keep +them. `fix-variant` moves no value, so a family whose presets all wrote one value repeats the widened +array in each; put it on the family's base afterwards ([shared bases](shared-bases.md)). + +### Variant names + +`check_variant_names` reads the four list keys plus `extruder_type`, `nozzle_volume_type` and +`default_nozzle_volume_type` of every preset the bundle's index references, bases included, and holds +each entry to the names the engine's two enum maps define (`s_keys_map_ExtruderType`, +`s_keys_map_NozzleVolumeType`, read from `PrintConfig.cpp` on every run). The bundle's own files are +judged, not the composed config: a bad string is the writing file's error, once. Every finding is an +error, and no bundle is exempt: BBL, whose bundle is imported from BambuStudio, is held to OrcaSlicer's +enums like any other. + +- A variant string outside ` ` is a **dead variant**: it still + counts toward the variant length the arrays are sized by, so the values written for it silently never + reach the G-code. `Hybrid` too, which is runtime-only, and an empty entry. A name BambuStudio's enum + has and OrcaSlicer's lacks is dead here as well, and passes with no tool change once the engine gains + that nozzle volume type. +- A legacy name the loader still rewrites in these keys (`Normal` → `Standard`, `Big Traffic` → + `High Flow`) is an error that names the enum name to write; the profile has to spell the enum + name. `DirectDrive` is only rewritten in `extruder_type`, so a variant string carrying it is dead. +- A variant list naming one variant twice is an error: the lookup returns the first equal string, so + the repeat is unreachable and its value sits at an index no extruder reads. A filament list takes + strings, `extruder_variant_list` takes them per extruder, and a process takes `(extruder id, variant)` + pairs — one string on two extruders is two pairs, not a repeat. +- An `extruder_type`, `nozzle_volume_type` or `default_nozzle_volume_type` value that is not an enum + name is an error: they are enum options, so an unknown value fails the validator's load of the + whole bundle, while the app silently loads the option's default instead. A legacy spelling + (`DirectDrive`, `Normal`, `Big Traffic`) and `Hybrid`, an enum value no profile writes, are errors + too. + +The variant *order*, the choice of variants, and the values themselves are not checked. ### `normalize` and `update-index` are part of the check -`check` fails when either command would still change something, so they are not optional polish — the +`check` fails when either command would still change something, so they are not optional polish: the file that gets reviewed has to be the file that ships. What `normalize` changes is narrow and fixed: -adds a missing `type`, deletes a `version` or `is_custom_defined` key from a *preset* file, deletes six -print-speed keys from filament profiles (`initial_layer_print_speed`, `outer_wall_speed`, -`inner_wall_speed`, `infill_speed`, `top_surface_speed`, `travel_speed`), deletes the -obsolete keys in `PrintConfigDef::handle_legacy`'s `ignore` set across preset types, resolves the -`extruder_clearance_*` conflict pair by keeping the larger, arrayifies five filament options besides -`filament_type`, and hoists `type`, `name`, `renamed_from`, `inherits`, `from`, `setting_id`, -`filament_id`, `instantiation` to the front. A file it changes is then rewritten whole — tab-indented, -LF, one trailing newline, keys reordered. + +- adds a missing `type`; +- deletes a `version` or `is_custom_defined` key from a *preset* file; +- deletes six print-speed keys from filament profiles (`initial_layer_print_speed`, `outer_wall_speed`, + `inner_wall_speed`, `infill_speed`, `top_surface_speed`, `travel_speed`); +- deletes the obsolete keys the loader ignores (the `ignore` set in `PrintConfigDef::handle_legacy`), + across preset types; +- resolves the `extruder_clearance_*` conflict pair by keeping the larger; +- arrayifies six filament options (`filament_type`, `filament_cost`, `filament_density`, + `temperature_vitrification`, `filament_max_volumetric_speed`, `filament_vendor`); +- hoists `type`, `name`, `renamed_from`, `inherits`, `from`, `setting_id`, `filament_id`, + `instantiation` to the front. + +A file it changes is then rewritten whole: tab-indented, LF, one trailing newline, keys reordered. A +file committed with CRLF line endings therefore changes on every line; read the diff before committing +it. **Set `type` explicitly when authoring.** For a file in `machine/` without it, normalization guesses -`machine` only if its name contains `nozzle`, otherwise `machine_model`. That heuristic cannot -reliably classify shared machine bases or unusually named variants. +`machine` only if its name contains `nozzle` (case-insensitive), otherwise `machine_model`. That +heuristic cannot reliably classify shared machine bases or unusually named variants. -The Python obsolete-key set is checked against the C++ source by a unit test. Active options -and legacy aliases that the loader migrates (such as `extruder_type` and -`extruder_clearance_max_radius`) are preserved. +The tool's obsolete-key set is checked against the loader's ignore list by a unit test. Active options +are preserved, including live keys whose *values* the loader rewrites (`extruder_type`: `DirectDrive` → +`Direct Drive`; the variant-string keys: `Normal` / `Big Traffic` → `Standard` / `High Flow`), and so are +legacy key names the loader migrates (such as `extruder_clearance_max_radius`). Two things it therefore does **not** enforce: - **Formatting and key order on their own.** A file with none of those problems is skipped entirely, so 4-space indent, a missing trailing newline, and a file that leads with `compatible_printers` all pass - `check`. They stay latent until something else trips `normalize` and the whole file reformats inside an - unrelated diff. (`normalize --force` rewrites every file, which is not something to run on a shipped - bundle.) + `check`. They stay latent until something else trips `normalize` and the whole file reformats inside + an unrelated diff. (`normalize --force` rewrites every file; do not run it on a shipped bundle.) - **A misspelled setting key.** `inital_layer_height` and `sparse_infill_densiti` pass `check` cleanly. - Verify new keys against `PrintConfig.cpp` and `PrintConfigDef::handle_legacy`. + Verify new keys against `src/libslic3r/PrintConfig.cpp` and the loader's legacy handling + (`PrintConfigDef::handle_legacy`: renamed keys, rewritten values and ignored keys). + +`check` does not catch a dangling `default_print_profile` either; check that name by hand. ## The validator binary -Built from `src/dev-utils/OrcaSlicer_profile_validator.cpp` (`-DORCA_TOOLS=ON`). -Both scripts find a local build under `build*/` — `check_profile.sh` tries Release, RelWithDebInfo, then -Debug, and `check_profile.ps1` adds MinSizeRel — else they download the nightly into the -`validator` subdirectory of the per-user cache dir (see above). Pass `--download` / `-Download` to -match CI exactly, since a stale local build is used silently. Windows looks for +Built from `src/dev-utils/OrcaSlicer_profile_validator.cpp` with `-DORCA_TOOLS=ON`. Both scripts use a +local build under `build*/` when one exists, else they download the nightly into the `validator` +subdirectory of the cache dir. `check_profile.sh` searches Release, then RelWithDebInfo, then Debug +(each under `build*/src/` and `build*/*/src/`), then single-config `build*/src`, and +prefers a host-architecture build tree; `check_profile.ps1` tries Release, RelWithDebInfo, MinSizeRel, +then Debug. A stale local build is used silently; `--download` / `-Download` skips local builds and uses the +nightly. The download and the fixtures stay cached until `--refresh` / `-Refresh`, so +`--download --refresh` (`-Download -Refresh`) matches CI exactly. Windows looks for `OrcaSlicer_profile_validator.exe`. -If your build lives somewhere else entirely, point at it with `--validator` / `-Validator`, or set +If your build lives somewhere else, point at it with `--validator` / `-Validator`, or set `ORCA_PROFILE_VALIDATOR` (`$env:ORCA_PROFILE_VALIDATOR` in PowerShell). | Flag | Meaning | @@ -167,11 +330,12 @@ If your build lives somewhere else entirely, point at it with `--validator` / `- | `-l ` | log level; CI uses 2 | | `-v ` | load only that vendor **plus** OrcaFilamentLibrary | | `-s` | slice sweep | +| `-o ` | with `-s`, save each printer's G-code there | | `-f` | no-op (see above) | | `-g 1` | regenerate user-preset fixtures; takes a value, and wipes the user preset dir first | -On ARM64 Linux the nightly is x86-64 only — the script warns and downloads anyway, producing a binary -that will not run. Build it locally instead. +On ARM64 Linux the nightly is x86-64 only: the script warns and downloads anyway, producing a binary +that will not run. Build it locally with `-DORCA_TOOLS=ON` and pass `--validator`. Running the validator directly uses the profile tree as its data directory and can create `user/` there. Prefer the wrappers, which stash existing user presets and restore them afterward. After a @@ -185,16 +349,27 @@ Use `--profiles DIR` on the Python tool and `-p DIR` on the validator. The wrapp ```bash ./scripts/check_profile.sh --profiles "" +# Windows: scripts\check_profile.bat -ProfilesDir "" ``` -On Windows use `scripts\check_profile.bat -ProfilesDir ""`. +To slice a process or filament that is not a printer's default, or to read the G-code, work on a copy: +copy `resources/profiles` and `resources/info` into one scratch dir (the validator reads `info/` next to +the tree), point the printer's `default_print_profile` or first `default_filament_profile` at the preset +in the copy, and run the validator with `-o`: + +```bash + -p /profiles -v "" -s -o +``` + +Each printer's G-code is saved as `__.gcode`; its embedded config +(`; print_settings_id = …`, `; filament_settings_id = …`) shows what was actually sliced. ## Testing in the app -Editing this checkout's `resources/profiles` does not update a separately installed application. -Test with a build using the edited resources and a bumped bundle version; the updater installs newer -bundles under `/system/`, and the preset cache also depends on the bundle version. -Use Help ▸ Show Configuration Folder to locate the active data directory: +Editing this checkout's `resources/profiles` does not update a separately installed application. Test +with a build using the edited resources and a bumped bundle version: the updater installs newer bundles +under `/system/`, and the preset cache also depends on the bundle version. Use Help ▸ Show +Configuration Folder to locate the active data directory: | Platform | Default data directory | | --- | --- | @@ -202,58 +377,71 @@ Use Help ▸ Show Configuration Folder to locate the active data directory: | Linux | `$XDG_CONFIG_HOME/OrcaSlicer`, or `~/.config/OrcaSlicer` when unset | | Windows | `%APPDATA%\OrcaSlicer` | -A portable `data_dir` next to the executable takes precedence. Use a separate test configuration -for a clean-install check; preserve the normal configuration and user presets. - -## Cross-platform paths - -Match the exact case of each `sub_path` and asset filename; Linux filesystems commonly distinguish -case even when a macOS or Windows checkout does not. Preset-name references are case-sensitive -on every platform. Avoid Windows-invalid characters (`< > : " | ? *`), reserved device names -such as `CON` / `NUL` (including with extensions), and trailing spaces or dots in path components. -Keep stems tidy too, but a space immediately before `.json` is not a trailing path-component space. +A portable `data_dir` next to the executable takes precedence. Use a separate test configuration for a +clean-install check; preserve the normal configuration and user presets. ## Error → remedy | Message | Fix | | --- | --- | -| `can not find inherits for ` | parent missing, unregistered, or listed **after** the child | -| `can not find filament_id for ` | nothing in the chain declares one — run `generate-id` | -| `can not find parent for config !` | a shipped name disappeared — add `renamed_from` | -| `Missing instantiation attribute for ` | key absent **or** not the string `"true"`/`"false"` | +| `can not find inherits for ` | parent missing, unregistered, misspelled, or listed **after** the child | +| `can not find include` | the template is misspelled, registered after the includer, or selectable | +| `can not find filament_id for ` | nothing in the chain declares one: run `generate-id` | +| `can not find parent for config !` | a shipped name disappeared: add `renamed_from` | +| `Failed loading configuration file ` | that file could not be loaded and the whole bundle was discarded: a JSON error, or a value its option cannot take, such as `nil` in a non-nullable key (`Invalid value provided for parameter : nil`, `Deserializing nil into a non-nullable object`); the lines above it name the cause | +| `Missing instantiation attribute for ` | key absent **or** not the string `"true"` / `"false"` | | `contains incorrect keys: , which were removed` | a key valid for a different preset type | -| `defines invalid printer variant ""` | not in the model's `nozzle_diameter` list | -| `has printer_variant "" that does not match its nozzle_diameter` | the set comparison in [machine-profiles.md](machine-profiles.md) | -| `references unknown compatible_printers "

"` | the printer was renamed or deleted; fix the reference | +| `defines invalid printer variant ""` | not a token of the model's `nozzle_diameter` list | +| `has printer_variant "" that does not match its nozzle_diameter` | [the set comparison](machine-profiles.md#printer_model-and-printer_variant) | +| `references unknown compatible_printers "

"` | the printer was renamed or deleted, or a `machine_model` name was used instead of a variant name: fix the reference. Under `--vendor`, usually another vendor's printer ([why](#the-five-checks)) | | `references renamed compatible_printers "" (now "")` | in-tree references must name the current preset; `renamed_from` does not excuse them | -| `Filament preset "" is missing compatible_printers setting` | non-library filaments need a non-empty list in their **own** file — the flattened-vs-own-key trap is in [filament-profiles.md](filament-profiles.md#compatible_printers) | -| `Ambiguous AMS filament match: N presets share filament_id "X" … printer "Y"` | make the lists disjoint by [specificity](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product) — the specialized profile keeps the variant, the general ones drop it; prefer this over deleting a profile — or fix an `inherits` pointing at another material's `@base`. `orca_profile_tool.py check` does not catch this; only `validate_system` here does | -| `Layer height cannot exceed nozzle diameter.` / `Line width too small` | `Print::validate()` flow rules | +| `Filament preset "" is missing compatible_printers setting` | non-library filaments need a non-empty list in their **own** file; the resolved-vs-own-key trap is in [filament-profiles.md](filament-profiles.md#compatible_printers) | +| `Ambiguous AMS filament match: N filament presets share filament_id "X" and are all compatible with printer "Y"` | make the lists disjoint by [specificity](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product): the specialized profile keeps the variant, the general ones drop it; prefer this over deleting a profile. Or fix an `inherits` pointing at another product's `@base`. `orca_profile_tool.py check` does not catch this; only `validate_system` does | +| `Layer height cannot exceed nozzle diameter.` / `Line width too small` / `Line width too large` | the [slicing limits](process-profiles.md#values-to-review-per-nozzle) | | `[ERROR] … no .json list references it, so it never loads` | `update-index`, or delete the file | -| `[ERROR] … references it and it declares no profile type` | set the correct `type` explicitly, then `normalize` and `update-index` | +| `[ERROR] … no .json list references it and it declares no profile type` | set the correct `type` explicitly, then `normalize` and `update-index` | | `[ERROR] … normalize would ` / `.json: update-index would rebuild ` | run that command and commit the result | | `[ERROR] has N profiles named ""` | identify the intended preset and remove or rename the duplicate; use `trim --dry-run` only for deliberate unindexed-file cleanup | -| `[ERROR] … must not have a setting_id` / `is missing a setting_id` | `generate-id --setting-id` | -| `inherits filament_id "X" but its own triple … mints "Y"` | `generate-id` will **not** fix this — see [ids.md](ids.md) | -| `vendor 's config version: invalid` | the `version` string is not Semver-parseable | -| `[json.exception.type_error.302] type must be string` | locate the non-string value in the index or model; see [failure scopes](vendor-bundle.md#failure-modes-ranked-by-blast-radius) | -| `Printer "

" fell back to a default preset` | final process or filament selection is a generic Default preset; check named defaults, visibility and available compatible presets. An incompatible default may instead be replaced without this error | -| `Printer "

" sliced but the filament change never fired` | `change_filament_gcode` never expanded | +| `Duplicate key error in : Duplicate key detected: ` | a key written twice in one file; keep the intended one | +| `… must not have a setting_id` / `… is missing a setting_id` / `setting_id "X" in does not match the expected "Y" …` | `generate-id --setting-id` (by hand in `BBL/`, see [ids.md](ids.md#bbls-exception-precisely)) | +| `filament_id "X" declared by … does not match the mint of its triple …` | `generate-id --filament-id`; if the id should not be declared here at all, remove it so the preset inherits its root's | +| `inherits filament_id "X" but its own triple "V/T/N" mints "Y"` | `generate-id` will **not** fix this; see [ids.md](ids.md#what-generate-id-does-and-does-not-fix) | +| `"" has N values for variant length S at stride k, which takes M` (with ` (no , so …)` after `S`, naming where `S` came from, when the preset writes no list, and ` (it comes from )` at the end under `--strict` for an array the preset does not write) | exactly `S × k` values in variant order, or leave the key out ([widths](extruder-variants.md#widths)); on a list-less multi-extruder printer whose extruders differ, declare the layout; `fix-variant` cuts or pads to that width ([variant arrays](#variant-arrays)); an `S` you did not expect means the variant list did not resolve through `include` or `inherits` | +| `printer_extruder_variant […] is not extruder_variant_list flattened extruder-major […]` / `printer_extruder_id […] does not give each entry of printer_extruder_variant its 1-based extruder […]` / `printer_extruder_id has N entries for the M entries of printer_extruder_variant` | write the pair as the flattening of the list, ids in step ([Printer rule 2](extruder-variants.md#printer-machine)) | +| `extruder_variant_list has N entries for M extruder(s)` / `extruder_variant_list entry i "…" holds a variant that does not start with extruder i's extruder_type` / `default_nozzle_volume_type "…" is not a nozzle volume type extruder i lists` | [Printer rules 1, 3 and 4](extruder-variants.md#printer-machine) | +| `extruder_variant_list offers N variants but the preset writes no printer_extruder_variant/printer_extruder_id` / `printer_extruder_variant lists several variants for extruder N but the preset writes no extruder_variant_list` / `[WARNING] … with single_extruder_multi_material off the loader replaces printer_extruder_variant …` | write all three layout keys ([Printer rule 2](extruder-variants.md#printer-machine)) | +| `print_extruder_id has N entries for the M entries of print_extruder_variant` / `[WARNING] … print_extruder_variant repeats a variant but print_extruder_id is absent` | one id per variant entry, mirroring the printer's pairs ([Process rule 1](extruder-variants.md#process)) | +| ` holds "…", which no extruder can select: "…" is not a nozzle volume type the enum has (…)` / `… it does not start with an extruder type the enum has (…)` / `… is empty` / `… Hybrid names the sub-nozzles of one hybrid extruder at runtime` | write a legal variant string, ` ` from the two enums ([variant names](#variant-names), [variant strings](extruder-variants.md#variant-strings)); in every bundle, BBL included | +| `… holds the legacy variant "…"` / `extruder_type spells the legacy name "…"` / `nozzle_volume_type spells the legacy name "…"` / `default_nozzle_volume_type spells the legacy name "…"` | write the enum name the message gives: the loader still rewrites the legacy one, but `check` rejects it | +| ` lists "…" N times` / `print_extruder_variant lists the pair (extruder N, "…") N times` | drop the repeat and its value from every variant array: the lookup returns the first equal string | +| `extruder_type "…" is not one of (…)` / `nozzle_volume_type "…" is not one of (…)` / `default_nozzle_volume_type "…" is not one of (…)` / `… names "Hybrid", which the engine computes for a hybrid extruder at runtime` | they are enum options, so an unknown value fails the validator's load of the whole bundle and silently becomes the default in the app; use `s_keys_map_ExtruderType` / `s_keys_map_NozzleVolumeType`, `Hybrid` excepted ([variant strings](extruder-variants.md#variant-strings)) | +| `[WARNING] No profiles found for vendor:

` | a directory with no matching index (an emptied folder, or a `user/` left by a direct validator run); remove it | +| `… has no compatible system filament in its model's "default_materials"` | add a system filament preset compatible with that variant to the model's `default_materials` | +| `… names the unknown system filament "" in its "default_materials"` / `… "default_filament_profile"` | name an existing system (not user, not base) filament exactly; `;` separators, exact case | +| `Missing filament profile: '' referenced in ` | the same, caught by `check`; usual causes are `,` instead of `;`, wrong case (`@system`), or a `;`-joined list packed into one array element | +| `machine_model name "" is declared by N bundles` | model names are unique across the tree; rename the new model | +| `vendor 's config version: invalid` | the `version` string does not parse; write `MM.mm.pp.bb` | +| `[json.exception.type_error.302] type must be string` | locate the non-string value in the index or a model; see [failure scopes](vendor-bundle.md#failure-scopes) | +| `Printer "

" fell back to a default preset` | the final process or filament selection is a generic Default preset: check the named defaults, their visibility and that compatible presets exist. An incompatible default may instead be replaced without this error | +| `Printer "

" sliced but the filament change never fired (no CP TOOLCHANGE START)` | `change_filament_gcode` never expanded | ## CI -`.github/workflows/check_profiles.yml`, job **"Check profiles"**, on `pull_request` into `main` or -`release/*`, paths `resources/profiles/**`, `resources/printers/**`, `scripts/**` and the workflow itself. -There is no push trigger — a direct push to main runs no profile validation. +`.github/workflows/check_profiles.yml`, job **"Check profiles"**, runs on `pull_request` into `main` or +`release/*` touching `resources/profiles/**`, `resources/printers/**`, `scripts/**`, +`src/libslic3r/PrintConfig.cpp` (where the tool reads the variant key sets) or the workflow itself. +There is no push trigger: a direct push to main runs no profile validation. -The job opens with `python3 -m unittest discover -s scripts/tests -t scripts`, the tool's own unit -tests. That step is deliberately **not** `continue-on-error`: a broken tool makes everything it then says -about the profiles worthless. Every check after it is `continue-on-error` with a final gate, so one run -reports all five results. On failure a second workflow posts or replaces a single PR comment marked -``, with each failing log truncated to 30 KB; it deletes the comment -once the run is green. +The job opens with `python3 -m unittest discover -s scripts/tests -t scripts`, the tool's own unit tests +(run them locally after changing `scripts/`, with `py -3` on Windows, and keep `-t scripts` or the +imports fail). That step is deliberately **not** `continue-on-error`: a broken tool makes everything it +then says about the profiles worthless. Every check after it is `continue-on-error` with a final gate, +so one run reports all five results. On failure a second workflow posts or replaces a single PR comment +marked ``, holding the start of each failing log (30 KB per check, +12 KB per `validate_custom` fixture; reproduce locally for the full list); it deletes the comment once +the run is green. The job name is also the required check for the delegated-merge bot, which lets a vendor maintainer -self-merge a `resources/profiles//` PR with no human review — so whatever CI does not check -is what ships unreviewed. Its denied patterns refuse `^scripts/` and any `.py`, so a PR that touches the -tooling always needs a maintainer. +self-merge a PR limited to their own `resources/profiles//` folder with no human review, so +whatever CI does not check is what ships unreviewed. Its denied patterns refuse `^scripts/` and any +`.py`, so a PR that touches the tooling always needs a maintainer. diff --git a/.claude/skills/orca-profiles/references/vendor-bundle.md b/.claude/skills/orca-profiles/references/vendor-bundle.md index 29aac13331..d6c7710469 100644 --- a/.claude/skills/orca-profiles/references/vendor-bundle.md +++ b/.claude/skills/orca-profiles/references/vendor-bundle.md @@ -1,7 +1,7 @@ -# The vendor bundle and the loader +# Vendor bundles -A bundle is `resources/profiles/.json` (the index) plus `resources/profiles//`. -The **vendor id is the filename stem**, not the `name` inside — several differ (`BBL.json` is named +A bundle is `resources/profiles/.json` (the index) plus `resources/profiles//`. The +**vendor id is the filename stem**, not the `name` inside; the two may differ (`BBL.json` is named "Bambulab"). Asset paths and the `setting_id` formula use the id; the `validate_custom` fixture prefix uses the `name`. @@ -13,16 +13,16 @@ uses the `name`. "version": "02.04.00.03", "force_update": "0", "description": "Phrozen configurations", - "machine_model_list": [ { "name": "...", "sub_path": "machine/....json" } ], - "machine_list": [ ... ], - "process_list": [ ... ], - "filament_list": [ ... ] + "machine_model_list": [ { "name": "Phrozen Arco", "sub_path": "machine/Phrozen Arco.json" } ], + "machine_list": [ … ], + "process_list": [ … ], + "filament_list": [ … ] } ``` -The loader reads `name`, `version`, `url` and the four `*_list` arrays. -`description` is only logged. `force_update` is read by `PresetUpdater`, never by the loader. -`sub_path` is relative to the **vendor folder**. +The loader reads `name`, `version`, `url` and the four `*_list` arrays. `description` is only logged; +`force_update` is read by the profile updater, never by the loader. `sub_path` is relative to the +**vendor folder**. | List | Holds | | --- | --- | @@ -35,141 +35,180 @@ The loader reads `name`, `version`, `url` and the four `*_list` arrays. 1. **Everything is registered, bases included.** Every preset file on disk has exactly one entry in the matching list, and no unindexed preset file is left in the tree. -2. **Parents before children.** `inherits` resolves against a per-kind map filled as the list is walked - (`configs.clear()` then process, filaments, printers). A parent listed after its child produces - `can not find inherits for ` and the bundle is discarded. -3. **The index entry's `name` must equal the `name` inside the sub_path file.** `check_name_consistency` - walks the index looking for the files; `check_index_coverage` walks the files looking for them in the - index. The `renamed_from` escape hatch `check_name_consistency`'s docstring promises is commented out. +2. **Parents before children, includes before includers.** The lists load processes first, then + filaments, then printers, each in index order, and `inherits` and `include` resolve only against + presets of that type already loaded from it. A parent + listed after its child produces `can not find inherits for ` and the bundle is + discarded; an include listed after its includer is `can not find include`, a counted error that + leaves the includer without those keys. +3. **The index entry's `name` equals the `name` inside the `sub_path` file.** `renamed_from` does not + excuse a mismatch. -All three are `check` errors now, and `update-index` writes an index that satisfies all three from the -files on disk — including the parents-first ordering, by topological sort. Hand-editing the index is +All three are `check` errors, and `update-index` writes an index that satisfies all three from the +files on disk, including the dependency ordering (parents and templates before the presets that use +them, then, in name order, entries that neither depend on nor are depended on by another entry of their own +list, and any entry on a dependency cycle). Hand-editing the index is fine for a one-line addition, but the committed result must equal what `update-index` writes, because `check` compares them. -The loader itself reports none of this: an unregistered file, or an entry with a typo'd key -(`"subpath"`), is silently dropped. (A typo'd `sub_path` is a `check` error naming the entry.) +The loader itself reports none of this: an unregistered file, or an entry with a misspelled key +(`"subpath"`), is silently dropped. (A misspelled `sub_path` value is a `check` error naming the entry.) -`BBL/cli_config.json` and `BBL/filament/filaments_color_codes.json` are auxiliary data loaded by path, -not presets. The tool's `NON_PROFILE_FILES` excludes these basenames from preset maintenance. +`BBL/cli_config.json` and, in `BBL/filament/`, `filaments_color_codes.json`, `filament_id_map.json`, +`filament_name_map.json` and `support_recommended_params.json` are auxiliary data files read by path, +not presets. The last three carry a `type` key and look like presets; the tool excludes all five from +preset maintenance. ## `version` -Parsed by a four-component Semver where the 4th is folded in as `patch = patch*100 + value`. Write it -zero-padded, `MM.mm.pp.bb`; a couple of bundles drop a component or the padding, but do not imitate them. +Four components, `MM.mm.pp.bb`, compared as a version number in which the fourth is folded into the +third (`patch × 100 + build`). Write all four components, zero-padded. -- **Bump the version for every bundle the PR touches.** `PresetUpdater` installs bundled resources - only when their version is newer than the installed version; the `.opc` preset cache is also - versioned. Nothing in profile CI checks the bump. -- **Keep the last component ≤ 99.** `02.04.00.100` and `02.04.01.00` both parse to `2.4.100`. A bundle - that reaches `.99` carries into the third component (`02.03.02.99` → `02.03.03.00`). -- An **absent** version is worse than a stale one: the validator still passes, but `Semver::valid()` - excludes `0.0.0`, so the vendor is dropped from the configuration wizard entirely and the preset cache - is disabled for it. An *unparseable* version is not silent — it throws and discards the whole bundle - (see the failure table below). +- **Bump the version for every bundle the change touches.** The app installs bundled profiles only + when their version is newer than the installed one, and the `.opc` preset cache is also keyed on + the version. Nothing in profile CI checks the bump. +- **Keep the last component ≤ 99.** `02.04.00.100` and `02.04.01.00` both read as + `2.4.100`. A bundle that + reaches `.99` carries into the third component (`02.03.02.99` → `02.03.03.00`). +- An **absent** version is worse than a stale one: it reads as `0.0.0`, which is not a valid version. + `check` and the validator still pass, but the vendor is dropped from the setup wizard entirely and gets no preset cache. Confirm the key exists. An + *unparseable* version is not silent: it discards the whole bundle (`vendor 's config version: + invalid`). ## Common preset keys | Key | Value | | --- | --- | -| `type` | `machine_model` / `machine` / `process` / `filament` | -| `name` | the preset name; the filename is *not* authoritative | -| `inherits` | the parent's exact `name` — no path, no `.json` | +| `type` | `machine_model`, `machine`, `process` or `filament` | +| `name` | the preset name, the identity every reference uses; the filename is *not* authoritative | +| `inherits` | the parent's exact `name`: no path, no `.json` | +| `include` | a template's exact `name`, or an array of them, layered under this preset's own keys ([below](#inherits-and-include)) | | `instantiation` | the **string** `"true"` (selectable) or `"false"` (base) | -| `from` | `"system"` by convention; the vendor loader never reads it | -| `setting_id` | required on instantiated presets, forbidden on bases — generated | -| `renamed_from` | `;`-separated list of old names this preset supersedes | +| `from` | `"system"` for shipped presets | +| `setting_id` | generated; required on instantiated presets, forbidden on bases | +| `renamed_from` | `;`-separated old names this preset supersedes ([below](#renamed_from)) | These are config-preset keys; `machine_model` records have their own -[schema](machine-profiles.md#a-machine_model-is-not-a-config-preset). Keep `from` as `"system"` -for shipped presets. The vendor loader ignores it, but the CLI config-file loader accepts only -`system`, `user` or `User` and handles their inheritance differently. +[key set](machine-profiles.md#machine_model-a-record-not-a-config-preset). Keep `from` as `"system"`: +the bundle loader ignores it, but loading the file as a CLI config accepts only `system`, `user` or +`User` and handles their inheritance differently. -`instantiation` is the one metadata key that is hard-gated: a missing key or any value other than the -strings `"true"`/`"false"` is an error (`Missing instantiation attribute for `). A JSON boolean -`true` fails harder — it throws inside `load_from_json` and takes the **whole vendor bundle** down. +`instantiation` is the one metadata key the validator gates: a missing key or any value other than the +strings `"true"` / `"false"` is a counted error (`Missing instantiation attribute for `) that fails +the validator, though the preset still loads and is treated as selectable. A file with no +`instantiation` whose name contains `gcode`, or that has no `name`, silently becomes an include-only +template. A JSON boolean `true` fails harder: it takes the **whole vendor bundle** down. -### `inherits` +## `inherits` and `include` -Resolution is an exact-name lookup **within the same bundle**, plus one exception: filaments may inherit -from `OrcaFilamentLibrary`, which is loaded first and becomes the base bundle. Vendor-to-vendor -inheritance always fails. You can inherit from an instantiated preset as well as from a base; it is -common. +`inherits` resolves by exact name **within the same bundle**, plus one exception: filaments may inherit +from OrcaFilamentLibrary, which is loaded first. Vendor-to-vendor inheritance always fails, and an +unresolved `inherits` discards the bundle. You can inherit from an instantiated preset as well as from a +base. -### `renamed_from` +`"include": ["", …]` (or one bare name) pulls in `instantiation: "false"` presets of the same type +from the same bundle (never the library), registered before the includer. It shares a block of keys +between presets that do not share a parent: a variant layout, a G-code template. Only `"false"` presets +can be included, so a name that resolves to nothing (misspelled, registered after the includer, or a +selectable preset) is a counted error (`can not find include`) and the preset loads without it. + +**How a preset's config is composed:** start from the parent's stored config (a root starts from the +built-in defaults), apply each preset named in `include` in the order listed, then the preset's own +keys. Later layers win, so precedence is own keys > later includes > earlier includes > the `inherits` +chain. Only then is every variant key of the composed config resized to its variant length +([widths](extruder-variants.md#widths)), and keys of another preset type removed. The two routes hand +down different widths: + +- **`inherits` hands down the resized config.** A base is stored *after* its own resize, at the length + of its own `*_extruder_variant` (one variant for a base of any type that writes none, whatever its + extruder count). A child therefore inherits the base's arrays at the base's width: an array wider than + that is cut to its first values before any child sees it, and a child that adds variants gets those + first values padded. So widen an array only on a preset whose own variant list already has the + entries; a wide array on a narrow base is silently lost at load, and `check`, which composes at the + width each file wrote and judges selectable presets only, misses that cut. +- **`include` hands down the template's diff, at its pre-resize width.** An included preset contributes + every key where its own composed config (its parent, its own includes and its own keys) differs from + the built-in defaults, taken *before* its resize. So keys the template inherits are passed on too, + arrays it writes arrive at the width its file wrote, and a key it sets to the built-in default value + is not passed on at all, so it cannot override what the includer inherited. Resizing happens on the + includer, not on the template. + +## `renamed_from` One JSON string, `;`-separated for several old names. -- Write `"A;B"`, never `"A ; B"` — an unquoted item keeps its trailing space and can never match. +- Write `"A;B"`, never `"A ; B"`: a space after a `;` is skipped, but a space before it stays part of + the name (`"A "`), which can never match. - When `renamed_from` is **absent** and the name contains `@`, the loader auto-adds the `@`-removed form (`X @Y` → `X Y`) as a rename alias. Declaring an explicit `renamed_from` **suppresses** that, so a - preset that needs both the `@`-removed form and a real old name must list both. No shipped profile - currently does, which means any preset that gained a `renamed_from` quietly lost its `X Y` alias. + preset that needs both the `@`-removed form and a real old name must list both; a preset that gains + a `renamed_from` without it quietly loses its `X Y` alias. - It rescues names stored **outside** the tree: user presets and 3MF projects. It does **not** rescue - in-tree `inherits` (exact lookup), it does **not** satisfy `check_name_consistency`, the validator - reports an in-tree reference that only resolves through it (`references renamed compatible_printers - "OLD" (now "NEW")`), and `machine_model` records never read it at all. -- Only one preset may claim a given old name — two that do is a counted error + in-tree `inherits` (exact lookup), it does **not** satisfy the index-name rule, the validator reports + an in-tree reference that only resolves through it (`references renamed compatible_printers "OLD" + (now "NEW")`), and `machine_model` records never read it at all. +- Only one preset may claim a given old name; two that do is a counted error (`… was marked as renamed from "Y" … as well`). But the redirect is **inert while a live preset still - carries that name**, and nothing checks *that*; Z-Bolt ships a folder of such dead entries. + carries that name**, and nothing checks *that*, so a neighbour's `renamed_from` is no model. -## Failure modes, ranked by blast radius +## Failure scopes | Scope | Cause | | --- | --- | -| **All vendors, zero system profiles** | a non-string `version`, `name` or `url` at the top level of a vendor index (`"version": 2`), or non-string `nozzle_diameter` on a model — `nlohmann::type_error` escapes the per-vendor `std::runtime_error` catch | -| **The whole vendor bundle** | unparseable `version`; index JSON parse error; a `sub_path` file missing or unparseable; unresolvable `inherits`; duplicate preset name within the vendor; empty/unknown `printer_model` or `printer_variant`; a filament resolving no `filament_id` | -| **One preset** | `instantiation` missing or a wrong string; keys belonging to another preset type (`contains incorrect keys: …, which were removed`); a non-string inside a `*_list` entry (`invalid value type for `) | -| **Logged, not counted** | a raw JSON number in a preset — `invalid json type for `, the value is dropped and the exit code stays 0 | -| **Nothing reported by the loader** | unregistered file; misspelled setting key; missing bed/hotend asset. Only the first of those is a `check` error; the other two reach users | +| **Every vendor except OrcaFilamentLibrary, and all user presets** | a non-string where the index or a `machine_model` expects a string (`"version": 2` at the top level of an index, a numeric `name` or `url`, a non-string `nozzle_diameter` or other model key): `[json.exception.type_error.302] type must be string`, and the validator reports `Validation failed` | +| **The whole vendor bundle** | index JSON parse error; unparseable `version`; a listed file missing or unparseable; a value its option cannot take, such as `nil` in a non-nullable key (`Failed loading configuration file`); unresolved `inherits`; two selectable presets with one name; empty or unknown `printer_model` / `printer_variant`; a filament resolving no `filament_id`; a JSON boolean `instantiation` | +| **A counted error; the preset still loads** | `instantiation` missing or not `"true"` / `"false"`; keys belonging to another preset type (`contains incorrect keys: …, which were removed`); a non-string inside a `*_list` entry (`invalid value type for `); an `include` naming nothing usable (`can not find include`, loads without it) | +| **The rest of the file, logged only** | an array with a non-string element (`[0.4]`, `invalid json array`): that key and every key after it in the file are dropped, and no error is counted | +| **One value, logged only** | a raw JSON number in a preset (`invalid json type for `): the value is dropped and the exit code stays 0 | +| **Nothing reported by the loader** | unregistered file; two bases with one name, or a base and a selectable preset with one name (the first in the index wins); misspelled setting key; missing bed, hotend or cover asset. `check` catches the first two; the others reach users | -Deleting a file the index still lists surfaces as a *parse error* on line 1, not "file not found" — the -loader `ifstream`s the missing path and nlohmann reports `unexpected end of input`. +Deleting a file the index still lists surfaces as a *parse error* on line 1 (`unexpected end of input`), not "file +not found". -Preset names are a **single global namespace across every vendor**: a duplicate within one vendor is a -hard bundle failure, a duplicate across vendors is reported as `Found duplicated preset: in -vendor: ` and still counts as an error. `check_preset_name_uniqueness` catches the within-bundle -case earlier and more precisely — including an *unindexed* twin, which is one `sub_path` edit away from -silently becoming the parent every child resolves to (`std::map::emplace` keeps the first insertion, so -index order decides). Base names, by contrast, repeat across bundles by design: `fdm_process_common` -exists in nearly all of them. +Selectable preset names are a **single namespace across every vendor**: a duplicate within one vendor +is a hard bundle failure, and a duplicate across vendors is reported as `Found duplicated preset: +in vendor: ` and still counts as an error. `check` catches the within-bundle case earlier and +more precisely, bases included, and including an *unindexed* twin, which is one `sub_path` edit away +from silently becoming the parent every child resolves to (the first registered preset of a name wins, +so index order decides). Base names, by contrast, repeat across bundles by design: +every bundle may have its own `fdm_process_common` ([uniqueness](naming.md#uniqueness)). ## Starting a whole new vendor bundle -Nothing generates one; copy the smallest bundle that resembles the hardware. **`Voxelab` or `M3D`** are -the minimal shape — a shared machine base, the model, one variant, a shared process base, two -processes, and an empty `filament_list` that takes the library generics. Do *not* start from `Phrozen`: -it carries local `fdm_filament_*` copies that have drifted from the library, and a filament preset that -restates most of its parent — the style this skill advises against. +Nothing generates one; copy the smallest bundle that resembles the hardware. **`Voxelab`** is the +minimal shape: a shared machine base, the model, one variant, a shared process base, two processes, and +an empty `filament_list`, so the printer takes the library generics. Do *not* start from a bundle that +carries local `fdm_filament_*` copies, which drift from the library, or filament presets that restate +most of their parent, the style this skill advises against. Write the machine files **last**, so you only visit them once: -1. **Choose the names first** — model, variant(s), process(es). Everything else references them. +1. **Choose the names first**: model, variant(s), process(es). Everything else references them + ([naming.md](naming.md)). 2. `resources/profiles/.json`: `name`, `version` (`01.00.00.00`), `force_update: "0"`, - `description`, and all four `*_list` arrays (an empty `filament_list` is fine). -3. The shared bases — `/machine/fdm_machine_common.json` and - `/process/fdm_process_common.json`, both `"instantiation": "false"` with no `setting_id`. - For a Klipper printer add your own `/machine/fdm_klipper_common.json` inheriting the machine + `description`, and all four `*_list` arrays (empty is fine: `update-index` fills them once the files + exist, so this step only needs the bundle metadata to be right). +3. The shared bases: `/machine/fdm_machine_common.json` and + `/process/fdm_process_common.json`, both `"instantiation": "false"` with no `setting_id`. For + a Klipper printer add your own `/machine/fdm_klipper_common.json` inheriting the machine base; there is no shared one, because a `machine` preset can only inherit inside its own bundle. 4. One selectable process per variant, each naming its variant in `compatible_printers`. 5. Bed assets and `_cover.png`, all directly in `/`. None of them is needed for the - bundle to load, and nothing in CI checks them — but the bed files are inert unless the `machine_model` - names them in `bed_model` / `bed_texture`, and the cover is found by convention as + bundle to load, and nothing in CI checks them; but the bed files are inert unless the + `machine_model` names them in `bed_model` / `bed_texture`, and the cover is found by convention as `_cover.png`. -6. The `machine_model` record and the `machine` variants, now that every value they reference exists — +6. The `machine_model` record and the `machine` variants, now that every value they reference exists; the minimum key sets and the `default_*` shapes are in - [machine-profiles.md](machine-profiles.md#the-machine-variant). -7. Run the tool and validate — follow + [machine-profiles.md](machine-profiles.md#machine-the-variant). +7. Run the tool and validate: follow [Creating or modifying a profile](../SKILL.md#creating-or-modifying-a-profile). `generate-id` is not optional for a new bundle: the validator loads presets that have no `setting_id`, but `check` fails - every one of them. `update-index` will fill the four `*_list` arrays for you once the files exist, so - step 2 only needs the bundle metadata to be right. + every one of them. ## `resources/profiles_template/` A separate tree (`Template.json` + `Template/`) holding filament and process templates. It is **not** a -scaffold for shipped profiles — `CreatePresetsDialog.cpp` reads it for the in-app "create a custom -printer/filament" wizard, so editing it changes what users get when they create a custom preset. -`check_profile.sh`'s validator checks default to `resources/profiles` (redirectable with `-p`), and so -does `orca_profile_tool.py` (redirectable with `--profiles`); -neither covers this tree. +scaffold for shipped profiles: the app's "create a custom printer / filament" dialog reads it, so +editing it changes what users get when they create a custom preset. `check_profile.sh`'s validator +checks default to `resources/profiles` (redirectable with `-p`), and so does `orca_profile_tool.py` +(redirectable with `--profiles`); neither covers this tree. diff --git a/.claude/skills/orca-profiles/scripts/shared_settings.py b/.claude/skills/orca-profiles/scripts/shared_settings.py new file mode 100644 index 0000000000..261fe19da4 --- /dev/null +++ b/.claude/skills/orca-profiles/scripts/shared_settings.py @@ -0,0 +1,241 @@ +#!/usr/bin/env python3 +"""Find settings to move onto shared bases, and prove a move changed nothing. + + snapshot OUT.json write every selectable preset's config as the loader stores it + compare BEFORE.json report every value that differs from the snapshot; exit 1 if any + candidates --vendor V restated values; per base, the settings its presets all share and the + defaults with exceptions that would pay + +Every subcommand takes --profiles DIR (default resources/profiles). + +Configs are composed the loader's way: the parent's stored config, then each include at +the width its file wrote, then the preset's own keys, and every variant key resized to the +preset's own variant list (one variant without one), padded with its first value or cut. +A base is stored after that resize, so a variant array wider than a base's list reaches its +children cut. Not modelled: the built-in defaults. A key no file in a preset's chain writes +loads its default, so compare reports a key written on one side only separately: it is no +change when the written value is the option's default in PrintConfig.cpp. Nor is it modelled +that an include template does not pass on a key equal to the default. Reads +scripts/orca_profile_tool.py. +""" +import argparse +import json +import os +import sys +from collections import Counter, defaultdict + +# The profile tool lives in /scripts; this file in /.claude/skills/orca-profiles/scripts. +sys.path[:0] = [os.path.join(os.getcwd(), "scripts"), + os.path.join(os.path.dirname(os.path.abspath(__file__)), *[os.pardir] * 4, "scripts")] +import orca_profile_tool as tool # noqa: E402 + +TYPES = ("machine", "process", "filament") +# Keys the loader reads from each file as metadata; neither inherits nor include passes them on. +PER_FILE = {"type", "name", "from", "instantiation", "setting_id", "renamed_from", "description", + "inherits", "include", "version", "url", "is_custom_defined"} +# Keys the app replaces with the selected presets' names before slicing: a file's value never counts. +REPLACED = {"print_settings_id", "printer_settings_id", "filament_settings_id"} +# What a restructure changes by design, or what never reaches a slice. +MOVED_BY_DESIGN = {"inherits", "include"} | REPLACED +# Keys that stay in their own file: metadata, identity, and each preset's compatibility. +NEVER_SHARED = PER_FILE | REPLACED | {"filament_id", "compatible_printers", "compatible_prints", + "printer_variant", "printer_model"} + + +class Tree: + def __init__(self, profiles_dir): + self.dir = profiles_dir + self.scheme = tool._variant_scheme() + self.vendors = tool.list_vendor_names(profiles_dir) + self.bundles = {v: tool.load_vendor_configs(profiles_dir, v) for v in self.vendors} + self.cache = {} + + def lookup(self, vendor, ptype, name, in_ofl=False): + """(vendor the name resolves in, (rel, data)); filaments fall back to the library.""" + if not in_ofl and name in self.bundles[vendor][ptype]: + return vendor, self.bundles[vendor][ptype][name] + if ptype == "filament" and tool.OFL in self.bundles and name in self.bundles[tool.OFL][ptype]: + return tool.OFL, self.bundles[tool.OFL][ptype][name] + return None, None + + def composed(self, vendor, ptype, name, drop=None, seen=frozenset()): + """Config before the preset's own resize: parent stored, includes, own keys.""" + owner, found = self.lookup(vendor, ptype, name, vendor == tool.OFL) + if found is None or (owner, name) in seen: + return {} + seen = seen | {(owner, name)} + data = found[1] + config = {} + if data.get("inherits"): + config.update(self.stored(owner, ptype, data["inherits"], seen)) + include = data.get("include") or [] + for included in [include] if isinstance(include, str) else include: + if included in self.bundles[owner][ptype]: + config.update(self.composed(owner, ptype, included, seen=seen)) + config = {k: v for k, v in config.items() if k not in PER_FILE} + config.update((k, v) for k, v in data.items() if k != drop) + return config + + def stored(self, vendor, ptype, name, seen=frozenset()): + key = (vendor, ptype, name) + if key not in self.cache: + self.cache[key] = self.resize(ptype, self.composed(vendor, ptype, name, seen=seen)) + return self.cache[key] + + def resize(self, ptype, config): + list_key, strides = self.scheme[ptype] + length = len(tool._as_list(config[list_key])) if list_key in config else 1 + out = dict(config) + for key, stride in strides.items(): + if key in out: + values = tool._as_list(out[key]) + need = length * stride + out[key] = values[:need] + values[:1] * (need - len(values)) + return out + + def presets(self, vendors=None, ptypes=TYPES): + for vendor in vendors or self.vendors: + for ptype in ptypes: + for name, (rel, data) in sorted(self.bundles[vendor][ptype].items()): + yield vendor, ptype, name, rel, data + + +def snapshot(tree): + return {f"{vendor}/{ptype}/{name}": {k: v for k, v in tree.stored(vendor, ptype, name).items() + if k not in MOVED_BY_DESIGN} + for vendor, ptype, name, _rel, data in tree.presets() + if data.get("instantiation") == "true"} + + +def compare(before, after): + changed, one_sided = 0, [] + for preset in sorted(before.keys() | after.keys()): + old, new = before.get(preset), after.get(preset) + if old is None or new is None: + print(f"{preset}: {'added' if old is None else 'removed'}") + changed += 1 + continue + for key in sorted(old.keys() | new.keys()): + if key not in old or key not in new: + one_sided.append(f"{preset}: {key} " + f"{json.dumps(old[key]) if key in old else '(built-in default)'} -> " + f"{json.dumps(new[key]) if key in new else '(built-in default)'}") + elif old[key] != new[key]: + print(f"{preset}: {key} {json.dumps(old[key])} -> {json.dumps(new[key])}") + changed += 1 + for line in one_sided: + print(line) + print(f"{changed} difference(s)") + if one_sided: + print(f"{len(one_sided)} key(s) written on one side only: each is a difference unless the " + f"written value is the option's default in src/libslic3r/PrintConfig.cpp") + return changed + len(one_sided) + + +def candidates(tree, vendor, ptypes, group_by): + for ptype in ptypes: + entries = {name: data for _v, _t, name, _rel, data in tree.presets([vendor], (ptype,))} + selectable = [n for n, d in entries.items() if d.get("instantiation") == "true"] + stored = {n: tree.stored(vendor, ptype, n) for n in entries} + list_key = tree.scheme[ptype][0] + + # Restated: a key a file writes that it would inherit unchanged without writing it. + restated = {} + for name, data in entries.items(): + restated[name] = sorted( + k for k in data if k not in NEVER_SHARED and k != list_key + and (data.get("inherits") or data.get("include")) + and tree.resize(ptype, tree.composed(vendor, ptype, name, drop=k)).get(k) == stored[name][k]) + if restated[name]: + print(f"{vendor}/{ptype} {name}: restates what it inherits: {', '.join(restated[name])}") + + # Groups: every preset with selectable presets below it, or the --group-by values. + chain = {n: [] for n in selectable} + for name in selectable: + node = entries[name].get("inherits") + while node in entries and node not in chain[name]: + chain[name].append(node) + node = entries[node].get("inherits") + groups = defaultdict(list) + for name in selectable: + if group_by: + groups[json.dumps(stored[name].get(group_by))].append(name) + else: + for base in chain[name]: + groups[base].append(name) + printed = {} + for label, members in sorted(groups.items(), key=lambda g: -len(g[1])): + if len(members) < 2 or label == "null": + continue + if frozenset(members) in printed: + print(f"\n{vendor}/{ptype} {label}: the same presets as {printed[frozenset(members)]}") + continue + common = [b for b in chain[members[0]] if all(b in chain[m] for m in members[1:])] + home = common[0] if group_by and common else None if group_by else label + + def below(m): + """m and the files between it and the group's home.""" + return [m] + chain[m][:chain[m].index(home)] if home in chain[m] else [m] + shared, defaults = [], [] + for key in sorted(set().union(*(entries[m].keys() for m in members)) - NEVER_SHARED): + loaded = [json.dumps(stored[m].get(key)) for m in members] + counts = Counter(loaded).most_common(2) + if len(counts) == 1: + writers = sum(key in entries[m] and key not in restated[m] for m in members) + if writers >= 2: + shared.append(f"{key} ({writers} write it)") + continue + (top, held), (_, runner_up) = counts + if held == runner_up or top == "null" or home is None: + continue + # Balance 5: w presets drop their copy; a presets that take the key from the home + # (no file on their way to it writes it) and load another value must write theirs. + w = sum(key in entries[m] and v == top for m, v in zip(members, loaded)) + a = sum(v != top and not any(key in entries[f] for f in below(m)) + for m, v in zip(members, loaded)) + if w - a > 1: + shown = top if len(top) <= 40 else top[:37] + "..." + defaults.append(f"{key} = {shown}: {held} load it, {w} write it, " + f"{a} would have to write their own") + if shared or defaults: + where = f"; nearest common base {common[0]}" if group_by and common else "" + title = f"{group_by} = {label}" if group_by else label + print(f"\n{vendor}/{ptype} {title}: {len(members)} presets{where}") + printed[frozenset(members)] = title + for line in shared: + print(f" {line}") + if defaults: + print(" default with exceptions:") + for line in defaults: + print(f" {line}") + + +def main(): + parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + profiles = argparse.ArgumentParser(add_help=False) + profiles.add_argument("--profiles", default=os.path.join("resources", "profiles"), + help="profiles directory (default: resources/profiles)") + sub = parser.add_subparsers(dest="command", required=True) + sub.add_parser("snapshot", parents=[profiles]).add_argument("out") + sub.add_parser("compare", parents=[profiles]).add_argument("before") + cand = sub.add_parser("candidates", parents=[profiles]) + cand.add_argument("--vendor", required=True) + cand.add_argument("--type", choices=TYPES, action="append") + cand.add_argument("--group-by", help="group selectable presets by this key's value instead of by " + "base: printer_model, gcode_flavor, extruder_type, filament_id, layer_height, ...") + args = parser.parse_args() + tree = Tree(args.profiles) + if args.command == "snapshot": + presets = snapshot(tree) + with open(args.out, "w", encoding="utf-8") as f: + json.dump(presets, f, sort_keys=True) + print(f"{len(presets)} selectable presets written to {args.out}") + elif args.command == "compare": + with open(args.before, encoding="utf-8") as f: + sys.exit(1 if compare(json.load(f), snapshot(tree)) else 0) + else: + candidates(tree, args.vendor, args.type or TYPES, args.group_by) + + +if __name__ == "__main__": + main() diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml index ada123c609..2a6ed8f0a4 100644 --- a/.github/workflows/check_profiles.yml +++ b/.github/workflows/check_profiles.yml @@ -14,6 +14,9 @@ on: # this workflow. - 'resources/printers/**' - 'scripts/**' + # orca_profile_tool.py reads the variant key sets from PrintConfig.cpp, and its + # tests the obsolete keys, so a PR changing either must be checked against the profiles. + - 'src/libslic3r/PrintConfig.cpp' - ".github/workflows/check_profiles.yml" workflow_dispatch: diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json index e65ced0f68..8f3676c875 100644 --- a/resources/profiles/Afinia.json +++ b/resources/profiles/Afinia.json @@ -1,6 +1,6 @@ { "name": "Afinia", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Afinia configurations", "machine_model_list": [ diff --git a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json index 77fc0deee9..1a50c4cc98 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFLfywkp", - "setting_id": "wAJTMxtCY7EoavRi", "name": "Afinia ABS+@HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "wAJTMxtCY7EoavRi", + "filament_id": "OFLfywkp", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Afinia/filament/Afinia ABS@HS.json b/resources/profiles/Afinia/filament/Afinia ABS@HS.json index e905e002bd..8c561e0cca 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS@HS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS@HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFV5wEMe", - "setting_id": "qCDnb2iBaz4hd4vX", "name": "Afinia ABS@HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "qCDnb2iBaz4hd4vX", + "filament_id": "OFV5wEMe", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Afinia/filament/Afinia PLA@HS.json b/resources/profiles/Afinia/filament/Afinia PLA@HS.json index cfd15a574b..d593ae69b4 100644 --- a/resources/profiles/Afinia/filament/Afinia PLA@HS.json +++ b/resources/profiles/Afinia/filament/Afinia PLA@HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OF9HCdyQ", - "setting_id": "N3sCgjdjvp6FTtw9", "name": "Afinia PLA@HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "N3sCgjdjvp6FTtw9", + "filament_id": "OF9HCdyQ", + "instantiation": "true", "filament_cost": [ "24.99" ], diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json index f98da8225d..7ef404c191 100644 --- a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFXi59OX", - "setting_id": "OxIiEYjbhEvSykaQ", "name": "Afinia Value ABS@HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "OxIiEYjbhEvSykaQ", + "filament_id": "OFXi59OX", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json index 1d9f669bd0..caf58c0956 100644 --- a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFgHh8ly", - "setting_id": "BASsUdyvElEVJ9AA", "name": "Afinia Value PLA@HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "BASsUdyvElEVJ9AA", + "filament_id": "OFgHh8ly", + "instantiation": "true", "filament_cost": [ "24.99" ], diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json index 1c93b3f1cd..f0c6153ff2 100644 --- a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "iwkXfmEyz9RLZTvh", "name": "Afinia H+1(HS) 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_afinia_common", + "from": "system", + "setting_id": "iwkXfmEyz9RLZTvh", + "instantiation": "true", "printer_model": "Afinia H+1(HS)", "default_print_profile": "0.20mm Standard @Afinia H+1(HS)", "nozzle_diameter": [ diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json index ecfca28454..0e5222b7ed 100644 --- a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "vngsrxKvEIsmr8tQ", "name": "Afinia H+1(HS) 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Afinia H+1(HS) 0.4 nozzle", + "from": "system", + "setting_id": "vngsrxKvEIsmr8tQ", + "instantiation": "true", "printer_model": "Afinia H+1(HS)", "default_print_profile": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", "nozzle_diameter": [ diff --git a/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json index 18e497cd01..954c198bfe 100644 --- a/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json +++ b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "FueWYijuvLNWzNmL", "name": "0.12mm Fine @Afinia H+1(HS)", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "setting_id": "FueWYijuvLNWzNmL", + "instantiation": "true", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json index cebbfe2206..0c6cedfd05 100644 --- a/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json +++ b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "Ntf0ZMcETTPz7EY1", "name": "0.16mm Optimal @Afinia H+1(HS)", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "setting_id": "Ntf0ZMcETTPz7EY1", + "instantiation": "true", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json index e5449b7e16..6b9b9ff29b 100644 --- a/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json +++ b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Lxid5Z2e0fvVDMMm", "name": "0.20mm Standard @Afinia H+1(HS)", - "from": "system", "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "setting_id": "Lxid5Z2e0fvVDMMm", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", diff --git a/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json index 0dad08c3b0..67af0c4dd0 100644 --- a/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json +++ b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "APeSqnRZh6I9OTFr", "name": "0.24mm Draft @Afinia H+1(HS)", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "setting_id": "APeSqnRZh6I9OTFr", + "instantiation": "true", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json index e8fb41dcb8..212b87411c 100644 --- a/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json +++ b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "VZ3NOVzdVWqZ37Ge", "name": "0.28mm Extra Draft @Afinia H+1(HS)", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "setting_id": "VZ3NOVzdVWqZ37Ge", + "instantiation": "true", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Anker.json b/resources/profiles/Anker.json index 945378db9c..6ff3e6d959 100644 --- a/resources/profiles/Anker.json +++ b/resources/profiles/Anker.json @@ -1,6 +1,6 @@ { "name": "Anker", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Anker configurations", "machine_model_list": [ diff --git a/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json index c3e47c80a3..b6ff6f9ca7 100644 --- a/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Anker 0.2 nozzle", - "inherits": "Generic ABS @Anker base", "renamed_from": "Anker Generic ABS 0.2 nozzle", + "inherits": "Generic ABS @Anker base", "from": "system", "setting_id": "iOCt7x95XbWYMe5q", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json index 64fd62eb64..51f6de86ef 100644 --- a/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Anker 0.25 nozzle", - "inherits": "Generic ABS @Anker base", "renamed_from": "Anker Generic ABS 0.25 nozzle", + "inherits": "Generic ABS @Anker base", "from": "system", "setting_id": "7Q2pr70SpSjK7v7Y", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic ABS @Anker.json b/resources/profiles/Anker/filament/Generic ABS @Anker.json index 978bc00e31..f33406b467 100644 --- a/resources/profiles/Anker/filament/Generic ABS @Anker.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Anker", - "inherits": "Generic ABS @Anker base", "renamed_from": "Anker Generic ABS", + "inherits": "Generic ABS @Anker base", "from": "system", "setting_id": "x3IBYtgKBx6Mszzk", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json index 1a40e93730..cb5c4d1a25 100644 --- a/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Anker 0.2 nozzle", - "inherits": "Generic ASA @Anker base", "renamed_from": "Anker Generic ASA 0.2 nozzle", + "inherits": "Generic ASA @Anker base", "from": "system", "setting_id": "lTR8QLbuttyVs5UW", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json index 0b85eef27c..9f44b88a13 100644 --- a/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Anker 0.25 nozzle", - "inherits": "Generic ASA @Anker base", "renamed_from": "Anker Generic ASA 0.25 nozzle", + "inherits": "Generic ASA @Anker base", "from": "system", "setting_id": "FU4BiMydEyo7zxq5", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic ASA @Anker.json b/resources/profiles/Anker/filament/Generic ASA @Anker.json index 53b84223df..0d83d71947 100644 --- a/resources/profiles/Anker/filament/Generic ASA @Anker.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Anker", - "inherits": "Generic ASA @Anker base", "renamed_from": "Anker Generic ASA", + "inherits": "Generic ASA @Anker base", "from": "system", "setting_id": "aDADuxiEKt2dVKOJ", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json index 6460721e2f..203b000c31 100644 --- a/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Anker 0.2 nozzle", - "inherits": "Generic PA @Anker base", "renamed_from": "Anker Generic PA 0.2 nozzle", + "inherits": "Generic PA @Anker base", "from": "system", "setting_id": "tYAT7xnNFD6gY84A", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json index ee2514e92c..96675fb685 100644 --- a/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Anker 0.25 nozzle", - "inherits": "Generic PA @Anker base", "renamed_from": "Anker Generic PA 0.25 nozzle", + "inherits": "Generic PA @Anker base", "from": "system", "setting_id": "Zlv65wLA94PbevRG", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PA @Anker.json b/resources/profiles/Anker/filament/Generic PA @Anker.json index e9acc2d7f6..eeb428ee33 100644 --- a/resources/profiles/Anker/filament/Generic PA @Anker.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Anker", - "inherits": "Generic PA @Anker base", "renamed_from": "Anker Generic PA", + "inherits": "Generic PA @Anker base", "from": "system", "setting_id": "sLWVtBxpAC53eUwo", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PA-CF @Anker.json b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json index 6c3b2d1860..80e71d3c37 100644 --- a/resources/profiles/Anker/filament/Generic PA-CF @Anker.json +++ b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Anker", - "inherits": "Generic PA-CF @Anker base", "renamed_from": "Anker Generic PA-CF", + "inherits": "Generic PA-CF @Anker base", "from": "system", "setting_id": "K4LcpR0zBp5klSpb", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json index 0126f9f893..024af4955c 100644 --- a/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Anker 0.2 nozzle", - "inherits": "Generic PC @Anker base", "renamed_from": "Anker Generic PC 0.2 nozzle", + "inherits": "Generic PC @Anker base", "from": "system", "setting_id": "2sSOgctcnVh9bGbQ", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json index 50aca840aa..ab09365cac 100644 --- a/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Anker 0.25 nozzle", - "inherits": "Generic PC @Anker base", "renamed_from": "Anker Generic PC 0.25 nozzle", + "inherits": "Generic PC @Anker base", "from": "system", "setting_id": "h7IRuq5uekjNw4vg", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PC @Anker.json b/resources/profiles/Anker/filament/Generic PC @Anker.json index 5433518c5a..4c28fc9182 100644 --- a/resources/profiles/Anker/filament/Generic PC @Anker.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Anker", - "inherits": "Generic PC @Anker base", "renamed_from": "Anker Generic PC", + "inherits": "Generic PC @Anker base", "from": "system", "setting_id": "ffufXVvW95sunH1B", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json index 2ff7eca4d1..ed66989ed4 100644 --- a/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Anker 0.2 nozzle", - "inherits": "Generic PETG @Anker base", "renamed_from": "Anker Generic PETG 0.2 nozzle", + "inherits": "Generic PETG @Anker base", "from": "system", "setting_id": "67ZHuiXPyCP6Tdtr", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json index 9f9ae2da35..62deaea017 100644 --- a/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Anker 0.25 nozzle", - "inherits": "Generic PETG @Anker base", "renamed_from": "Anker Generic PETG 0.25 nozzle", + "inherits": "Generic PETG @Anker base", "from": "system", "setting_id": "aLuRALDt0Otbd2So", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PETG @Anker.json b/resources/profiles/Anker/filament/Generic PETG @Anker.json index cdb08f8671..f4a1a3b557 100644 --- a/resources/profiles/Anker/filament/Generic PETG @Anker.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Anker", - "inherits": "Generic PETG @Anker base", "renamed_from": "Anker Generic PETG", + "inherits": "Generic PETG @Anker base", "from": "system", "setting_id": "hvV0rmnzRHJk9sMz", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json b/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json index e5a265c40f..ce47b93b01 100644 --- a/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json +++ b/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Anker", - "inherits": "Generic PETG-CF @Anker base", "renamed_from": "Anker Generic PETG-CF", + "inherits": "Generic PETG-CF @Anker base", "from": "system", "setting_id": "vCAuQeQLoXUk28ph", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json index e8ffdb8c57..7f8c7cf5ad 100644 --- a/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Anker 0.2 nozzle", - "inherits": "Generic PLA @Anker base", "renamed_from": "Anker Generic PLA 0.2 nozzle", + "inherits": "Generic PLA @Anker base", "from": "system", "setting_id": "rCvmCzPgi4KA6nmI", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json index 5e4e3e0f0b..73fa17a0dc 100644 --- a/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Anker 0.25 nozzle", - "inherits": "Generic PLA @Anker base", "renamed_from": "Anker Generic PLA 0.25 nozzle", + "inherits": "Generic PLA @Anker base", "from": "system", "setting_id": "C0hNEbEueKrcYojS", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA @Anker.json b/resources/profiles/Anker/filament/Generic PLA @Anker.json index 5049571bcb..b077555137 100644 --- a/resources/profiles/Anker/filament/Generic PLA @Anker.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Anker", - "inherits": "Generic PLA @Anker base", "renamed_from": "Anker Generic PLA", + "inherits": "Generic PLA @Anker base", "from": "system", "setting_id": "GfVhcxRmt6mHSemI", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json index e28ab1c79a..0f327899b8 100644 --- a/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Anker 0.2 nozzle", - "inherits": "Generic PLA Silk @Anker base", "renamed_from": "Anker Generic PLA Silk 0.2 nozzle", + "inherits": "Generic PLA Silk @Anker base", "from": "system", "setting_id": "NWGiPWYmLVktDMJt", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json index 2699cb1aea..2204fd0f6a 100644 --- a/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Anker 0.25 nozzle", - "inherits": "Generic PLA Silk @Anker base", "renamed_from": "Anker Generic PLA Silk 0.25 nozzle", + "inherits": "Generic PLA Silk @Anker base", "from": "system", "setting_id": "4thKBCnYgDtnAtF5", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json b/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json index 9629ba4f0b..109e113c55 100644 --- a/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Anker", - "inherits": "Generic PLA Silk @Anker base", "renamed_from": "Anker Generic PLA Silk", + "inherits": "Generic PLA Silk @Anker base", "from": "system", "setting_id": "URRIeNXIiIPjxbKL", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json index f32fb75a92..27fb60c005 100644 --- a/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Anker 0.2 nozzle", - "inherits": "Generic PLA+ @Anker base", "renamed_from": "Anker Generic PLA+ 0.2 nozzle", + "inherits": "Generic PLA+ @Anker base", "from": "system", "setting_id": "5m3xLxdReqLlE2Jp", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json index 291773e546..400d9d3752 100644 --- a/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Anker 0.25 nozzle", - "inherits": "Generic PLA+ @Anker base", "renamed_from": "Anker Generic PLA+ 0.25 nozzle", + "inherits": "Generic PLA+ @Anker base", "from": "system", "setting_id": "wwkWVDsg6SoeCS0F", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA+ @Anker.json b/resources/profiles/Anker/filament/Generic PLA+ @Anker.json index 1381c839da..41c212e697 100644 --- a/resources/profiles/Anker/filament/Generic PLA+ @Anker.json +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Anker", - "inherits": "Generic PLA+ @Anker base", "renamed_from": "Anker Generic PLA+", + "inherits": "Generic PLA+ @Anker base", "from": "system", "setting_id": "MDb4CH02FxbgPNjS", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json index 7be034702f..6b281e029c 100644 --- a/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json +++ b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Anker", - "inherits": "Generic PLA-CF @Anker base", "renamed_from": "Anker Generic PLA-CF", + "inherits": "Generic PLA-CF @Anker base", "from": "system", "setting_id": "5AdjHUxRi8LCU4E9", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic PVA @Anker.json b/resources/profiles/Anker/filament/Generic PVA @Anker.json index 35a7dd456a..852bf35006 100644 --- a/resources/profiles/Anker/filament/Generic PVA @Anker.json +++ b/resources/profiles/Anker/filament/Generic PVA @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Anker", - "inherits": "Generic PVA @Anker base", "renamed_from": "Anker Generic PVA", + "inherits": "Generic PVA @Anker base", "from": "system", "setting_id": "HXERDaP3AgzWtmiu", "instantiation": "true", diff --git a/resources/profiles/Anker/filament/Generic TPU @Anker.json b/resources/profiles/Anker/filament/Generic TPU @Anker.json index 44204f1113..4b931e51bd 100644 --- a/resources/profiles/Anker/filament/Generic TPU @Anker.json +++ b/resources/profiles/Anker/filament/Generic TPU @Anker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Anker", - "inherits": "Generic TPU @Anker base", "renamed_from": "Anker Generic TPU", + "inherits": "Generic TPU @Anker base", "from": "system", "setting_id": "5YigkBBSP2RM1MbK", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json index cc7334fa34..99f5351291 100644 --- a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Anycubic", - "inherits": "fdm_filament_abs", "renamed_from": "Anycubic Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "jKvjWU6rcHvWblWC", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json index 282f590739..cc16da633f 100644 --- a/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Anycubic", - "inherits": "fdm_filament_asa", "renamed_from": "Anycubic Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "o2Cr8cBtE4OKsTqm", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json index da5d2424e2..31be665d6d 100644 --- a/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Anycubic", - "inherits": "fdm_filament_pa", "renamed_from": "Anycubic Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "5MJsYpJIimshIDZm", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json index a360cfea1a..56243e67aa 100644 --- a/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Anycubic", - "inherits": "fdm_filament_pa", "renamed_from": "Anycubic Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "j1uioy0lCnm4AKrm", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json index e2da18b155..818f20c41f 100644 --- a/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Anycubic", - "inherits": "fdm_filament_pc", "renamed_from": "Anycubic Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "3jP8aWkWw2dT2fNM", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json index 697caad9d7..bace5dcb40 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Anycubic", - "inherits": "fdm_filament_pet", "renamed_from": "Anycubic Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ddafY4oOvEc6L6Ej", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json index e7fe864b7e..f9752fb4a0 100644 --- a/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Anycubic", - "inherits": "fdm_filament_pla", "renamed_from": "Anycubic Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qoYfeBQCSt15O9ye", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json index 0f0bd4462a..ba3ed7d904 100644 --- a/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Anycubic", - "inherits": "fdm_filament_pla", "renamed_from": "Anycubic Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "mLENUT39vBcQiLpm", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json index 7f6603b6db..5223c56dc8 100644 --- a/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Anycubic", - "inherits": "fdm_filament_pva", "renamed_from": "Anycubic Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "ae5ljmDsW7uauLz8", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json index d52428e4e5..a14d8f302b 100644 --- a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json +++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Anycubic", - "inherits": "fdm_filament_tpu", "renamed_from": "Anycubic Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "z0FSikhD8ZHv2UYt", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 Max 0.4 nozzle.json index ed52a91b21..f20d9cc14e 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 Max 0.4 nozzle.json @@ -104,79 +104,64 @@ "machine_end_gcode": "M400\nG92 E0 ; zero the extruder\nG1 E-2 F3600\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F900 ; Move print head further up{endif}\nG1 X420 Y420 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors", "machine_load_filament_time": "75", "machine_max_acceleration_e": [ - "10000", "10000", "10000" ], "machine_max_acceleration_extruding": [ - "10000", "10000", "10000" ], "machine_max_acceleration_retracting": [ - "10000", "10000", "10000" ], "machine_max_acceleration_travel": [ - "10000", "10000", "10000" ], "machine_max_acceleration_x": [ - "10000", "10000", "10000" ], "machine_max_acceleration_y": [ - "10000", "10000", "10000" ], "machine_max_acceleration_z": [ - "3000", "3000", "3000" ], "machine_max_jerk_e": [ - "20", "20", "20" ], "machine_max_jerk_x": [ - "20", "20", "20" ], "machine_max_jerk_y": [ - "20", "20", "20" ], "machine_max_jerk_z": [ - "20", "20", "20" ], "machine_max_speed_e": [ "600", - "300", - "780" + "300" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "20", - "10", - "26" + "10" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json index 676b43000d..09e690ea30 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json @@ -77,79 +77,64 @@ "machine_end_gcode": "G92 E0\nG1 E-2 F3600\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F900 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", "machine_load_filament_time": "42", "machine_max_acceleration_e": [ - "20000", "20000", "20000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "1000", "1000", "1000" ], "machine_max_jerk_e": [ - "20", "20", "20" ], "machine_max_jerk_x": [ - "20", "20", "20" ], "machine_max_jerk_y": [ - "20", "20", "20" ], "machine_max_jerk_z": [ - "20", "20", "20" ], "machine_max_speed_e": [ "600", - "300", - "780" + "300" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "15", - "10", - "26" + "10" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json index 8f265955c8..bacaca6168 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400\nG92 E0 ; zero the extruder\nG1 E-2 F3600\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F900 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors", "machine_load_filament_time": "42", "machine_max_acceleration_e": [ - "20000", "20000", "20000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "1000", "1000", "1000" ], "machine_max_jerk_e": [ - "20", "20", "20" ], "machine_max_jerk_x": [ - "20", "20", "20" ], "machine_max_jerk_y": [ - "20", "20", "20" ], "machine_max_jerk_z": [ - "20", "20", "20" ], "machine_max_speed_e": [ "600", - "300", - "780" + "300" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "15", - "10", - "26" + "10" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json index b8271d0d74..d76b34af49 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-1 F3600 ; retract\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F600 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", "machine_load_filament_time": "42", "machine_max_acceleration_e": [ - "20000", "20000", "20000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "1000", "1000", "1000" ], "machine_max_jerk_e": [ - "20", "20", "20" ], "machine_max_jerk_x": [ - "20", "20", "20" ], "machine_max_jerk_y": [ - "20", "20", "20" ], "machine_max_jerk_z": [ - "20", "20", "20" ], "machine_max_speed_e": [ "600", - "300", - "780" + "300" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "15", - "10", - "26" + "10" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json index 11565051e6..c28e9c620b 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json @@ -77,79 +77,64 @@ "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-2 F3000 ; retract\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F600 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", "machine_load_filament_time": "42", "machine_max_acceleration_e": [ - "20000", "20000", "20000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "1000", "1000", "1000" ], "machine_max_jerk_e": [ - "20", "20", "20" ], "machine_max_jerk_x": [ - "20", "20", "20" ], "machine_max_jerk_y": [ - "20", "20", "20" ], "machine_max_jerk_z": [ - "20", "20", "20" ], "machine_max_speed_e": [ "600", - "300", - "780" + "300" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "15", - "10", - "26" + "10" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json index 84651d79de..6ce4e4ccf5 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json @@ -1,12 +1,12 @@ { - "type": "machine_model", - "machine_tech": "FFF", - "family": "Anycubic", - "name": "Anycubic Kobra 3 V2", - "model_id": "Anycubic Kobra 3 V2", - "nozzle_diameter": "0.4;0.2;0.6;0.8", - "bed_model": "Anycubic Kobra 3 V2_buildplate_model.stl", - "bed_texture": "Anycubic Kobra 3 V2_buildplate_texture.svg", - "hotend_model": "", - "default_materials": "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle" + "type": "machine_model", + "name": "Anycubic Kobra 3 V2", + "machine_tech": "FFF", + "family": "Anycubic", + "model_id": "Anycubic Kobra 3 V2", + "nozzle_diameter": "0.4;0.2;0.6;0.8", + "bed_model": "Anycubic Kobra 3 V2_buildplate_model.stl", + "bed_texture": "Anycubic Kobra 3 V2_buildplate_texture.svg", + "hotend_model": "", + "default_materials": "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.25 nozzle.json index 8786b75afa..e49fc80ced 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.25 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM141 S0 ; turn off box temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ - "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "400", "400", "400" ], "machine_max_jerk_e": [ - "1", "1", "1" ], "machine_max_jerk_x": [ - "15", "15", "15" ], "machine_max_jerk_y": [ - "15", "15", "15" ], "machine_max_jerk_z": [ - "1", "1", "1" ], "machine_max_speed_e": [ "80", - "40", - "104" + "40" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "10", - "5", - "13" + "5" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.4 nozzle.json index f0ba840124..917ef24eb7 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.4 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM141 S0 ; turn off box temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ - "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "400", "400", "400" ], "machine_max_jerk_e": [ - "1", "1", "1" ], "machine_max_jerk_x": [ - "15", "15", "15" ], "machine_max_jerk_y": [ - "15", "15", "15" ], "machine_max_jerk_z": [ - "1", "1", "1" ], "machine_max_speed_e": [ "80", - "40", - "104" + "40" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "10", - "5", - "13" + "5" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.6 nozzle.json index 604d488bdb..15069e5a78 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.6 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM141 S0 ; turn off box temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ - "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "400", "400", "400" ], "machine_max_jerk_e": [ - "1", "1", "1" ], "machine_max_jerk_x": [ - "15", "15", "15" ], "machine_max_jerk_y": [ - "15", "15", "15" ], "machine_max_jerk_z": [ - "1", "1", "1" ], "machine_max_speed_e": [ "80", - "40", - "104" + "40" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "10", - "5", - "13" + "5" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.8 nozzle.json index d51a6fc560..711450dd79 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max 0.8 nozzle.json @@ -73,79 +73,64 @@ "machine_end_gcode": "M400\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM141 S0 ; turn off box temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ - "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ - "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ - "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ - "20000", "20000", "20000" ], "machine_max_acceleration_x": [ - "20000", "20000", "20000" ], "machine_max_acceleration_y": [ - "20000", "20000", "20000" ], "machine_max_acceleration_z": [ - "400", "400", "400" ], "machine_max_jerk_e": [ - "1", "1", "1" ], "machine_max_jerk_x": [ - "15", "15", "15" ], "machine_max_jerk_y": [ - "15", "15", "15" ], "machine_max_jerk_z": [ - "1", "1", "1" ], "machine_max_speed_e": [ "80", - "40", - "104" + "40" ], "machine_max_speed_x": [ "600", - "300", - "780" + "300" ], "machine_max_speed_y": [ "600", - "300", - "780" + "300" ], "machine_max_speed_z": [ "10", - "5", - "13" + "5" ], "machine_min_extruding_rate": [ "0", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max.json index 0f35afd33f..ec754a7324 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 Max.json @@ -1,12 +1,12 @@ { - "type": "machine_model", - "machine_tech": "FFF", - "family": "Anycubic", - "name": "Anycubic Kobra S1 Max", - "model_id": "Anycubic Kobra S1 Max", - "nozzle_diameter": "0.4;0.25;0.6;0.8", - "bed_model": "Anycubic Kobra S1 Max_buildplate_model.stl", - "bed_texture": "Anycubic Kobra S1 Max_buildplate_texture.svg", - "hotend_model": "", - "default_materials": "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle" + "type": "machine_model", + "name": "Anycubic Kobra S1 Max", + "machine_tech": "FFF", + "family": "Anycubic", + "model_id": "Anycubic Kobra S1 Max", + "nozzle_diameter": "0.4;0.25;0.6;0.8", + "bed_model": "Anycubic Kobra S1 Max_buildplate_model.stl", + "bed_texture": "Anycubic Kobra S1 Max_buildplate_texture.svg", + "hotend_model": "", + "default_materials": "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle;Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra X 0.4 nozzle.json index c7b3ce89a4..3bbdb12fc6 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra X 0.4 nozzle.json @@ -85,48 +85,63 @@ "machine_end_gcode": "M400\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "6500", "6500" ], "machine_max_acceleration_extruding": [ + "6500", "6500" ], "machine_max_acceleration_retracting": [ + "6500", "6500" ], "machine_max_acceleration_travel": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", "10000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "1", "1" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "20", "20" ], "machine_max_speed_e": [ + "250", "250" ], "machine_max_speed_x": [ + "450", "450" ], "machine_max_speed_y": [ + "450", "450" ], "machine_max_speed_z": [ + "12", "12" ], "machine_min_extruding_rate": [ diff --git a/resources/profiles/Artillery.json b/resources/profiles/Artillery.json index 180622cf3a..faa5aa0a98 100644 --- a/resources/profiles/Artillery.json +++ b/resources/profiles/Artillery.json @@ -1,6 +1,6 @@ { "name": "Artillery", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Artillery configurations", "machine_model_list": [ diff --git a/resources/profiles/Artillery/filament/Generic ABS @Artillery.json b/resources/profiles/Artillery/filament/Generic ABS @Artillery.json index caf687b95e..bad2754127 100644 --- a/resources/profiles/Artillery/filament/Generic ABS @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic ABS @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFY9muEs", - "setting_id": "DNgTEZpEz8bJoobJ", "name": "Generic ABS @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_abs", "renamed_from": "Artillery Generic ABS", + "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "DNgTEZpEz8bJoobJ", + "filament_id": "OFY9muEs", + "instantiation": "true", "filament_flow_ratio": [ "0.926" ], diff --git a/resources/profiles/Artillery/filament/Generic ASA @Artillery.json b/resources/profiles/Artillery/filament/Generic ASA @Artillery.json index 74ef4c775f..afc3e0cafc 100644 --- a/resources/profiles/Artillery/filament/Generic ASA @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic ASA @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFLPAxz3", - "setting_id": "xWHuScm0fPJCqjVx", "name": "Generic ASA @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_asa", "renamed_from": "Artillery Generic ASA", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "xWHuScm0fPJCqjVx", + "filament_id": "OFLPAxz3", + "instantiation": "true", "filament_flow_ratio": [ "0.93" ], diff --git a/resources/profiles/Artillery/filament/Generic PETG @Artillery.json b/resources/profiles/Artillery/filament/Generic PETG @Artillery.json index aa354e517d..8abc30673a 100644 --- a/resources/profiles/Artillery/filament/Generic PETG @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic PETG @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFYPdQJh", - "setting_id": "6wZKfV2XvuJSUSwl", "name": "Generic PETG @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pet", "renamed_from": "Artillery Generic PETG", + "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "6wZKfV2XvuJSUSwl", + "filament_id": "OFYPdQJh", + "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" ], diff --git a/resources/profiles/Artillery/filament/Generic PLA @Artillery.json b/resources/profiles/Artillery/filament/Generic PLA @Artillery.json index d691a9b470..6b5a88cfda 100644 --- a/resources/profiles/Artillery/filament/Generic PLA @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic PLA @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFDSrzZ8", - "setting_id": "T0sW3uMBr94Y1X1G", "name": "Generic PLA @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pla", "renamed_from": "Artillery Generic PLA", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "T0sW3uMBr94Y1X1G", + "filament_id": "OFDSrzZ8", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json b/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json index 08fd583e18..e3541dd937 100644 --- a/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFWbdGsC", - "setting_id": "Gxafdb0zYnf9kPwa", "name": "Generic PLA-CF @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pla", "renamed_from": "Artillery Generic PLA-CF", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "Gxafdb0zYnf9kPwa", + "filament_id": "OFWbdGsC", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Artillery/filament/Generic TPU @Artillery.json b/resources/profiles/Artillery/filament/Generic TPU @Artillery.json index f1270d0afb..75a423c165 100644 --- a/resources/profiles/Artillery/filament/Generic TPU @Artillery.json +++ b/resources/profiles/Artillery/filament/Generic TPU @Artillery.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFgbpcy9", - "setting_id": "dWhysRiE5GrAGyME", "name": "Generic TPU @Artillery", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_tpu", "renamed_from": "Artillery Generic TPU", + "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "dWhysRiE5GrAGyME", + "filament_id": "OFgbpcy9", + "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" ], diff --git a/resources/profiles/Artillery/filament/fdm_filament_abs.json b/resources/profiles/Artillery/filament/fdm_filament_abs.json index 0b06432204..5eb599e552 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_abs.json +++ b/resources/profiles/Artillery/filament/fdm_filament_abs.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_abs", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "105" ], diff --git a/resources/profiles/Artillery/filament/fdm_filament_asa.json b/resources/profiles/Artillery/filament/fdm_filament_asa.json index 930a2d3d0f..795413a24d 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_asa.json +++ b/resources/profiles/Artillery/filament/fdm_filament_asa.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_asa", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "105" ], diff --git a/resources/profiles/Artillery/filament/fdm_filament_pet.json b/resources/profiles/Artillery/filament/fdm_filament_pet.json index 379e0e0013..da7e5db8ec 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_pet.json +++ b/resources/profiles/Artillery/filament/fdm_filament_pet.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pet", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Artillery/filament/fdm_filament_pla.json b/resources/profiles/Artillery/filament/fdm_filament_pla.json index 062c3ea6f5..e8f09e7717 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_pla.json +++ b/resources/profiles/Artillery/filament/fdm_filament_pla.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pla", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "fan_cooling_layer_time": [ "100" ], diff --git a/resources/profiles/Artillery/filament/fdm_filament_tpu.json b/resources/profiles/Artillery/filament/fdm_filament_tpu.json index 91b0b1a200..fe1520851b 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_tpu.json +++ b/resources/profiles/Artillery/filament/fdm_filament_tpu.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_tpu", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "30" ], diff --git a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json index fec7ef73d3..71250b7ccd 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "F9lEQfH826Mqt6u3", "name": "Artillery Genius 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "F9lEQfH826Mqt6u3", + "instantiation": "true", "printer_model": "Artillery Genius", "default_print_profile": "0.20mm Standard @Artillery Genius", "nozzle_diameter": [ diff --git a/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json index abac060832..27dbc934c8 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "afpW4NvrOWzQvHbB", "name": "Artillery Genius Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "afpW4NvrOWzQvHbB", + "instantiation": "true", "printer_model": "Artillery Genius Pro", "default_print_profile": "0.20mm Standard @Artillery Genius Pro", "nozzle_diameter": [ diff --git a/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json index 232b68d62e..65a60c6649 100644 --- a/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "02YSChoFQuBRQ8vf", "name": "Artillery Hornet 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "02YSChoFQuBRQ8vf", + "instantiation": "true", "printer_model": "Artillery Hornet", "default_print_profile": "0.20mm Standard @Artillery Hornet", "nozzle_diameter": [ diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X1 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X1 0.4 nozzle.json index ab83e7d429..3e10106e08 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X1 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X1 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "nY4RXX9Ylh7AIc4U", "name": "Artillery Sidewinder X1 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "nY4RXX9Ylh7AIc4U", + "instantiation": "true", "printer_model": "Artillery Sidewinder X1", "default_print_profile": "0.20mm Standard @Artillery X1", "nozzle_diameter": [ diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json index 416ddfb056..a4ac11e7f9 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "cUhse9TrF7ElM5dh", "name": "Artillery Sidewinder X2 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "cUhse9TrF7ElM5dh", + "instantiation": "true", "printer_model": "Artillery Sidewinder X2", "default_print_profile": "0.20mm Standard @Artillery X2", "nozzle_diameter": [ diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 44354ce026..3f4f91efac 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1,7 +1,7 @@ { "name": "Bambulab", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json", - "version": "02.08.00.10", + "version": "02.08.00.11", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.2 nozzle.json index 0c48231b9e..c82f324007 100644 --- a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.2 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSB00_14", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.8 nozzle.json index bb2c6c215c..de71006ade 100644 --- a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.8 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S 0.8 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSB00_15", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S.json b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S.json index 2b3151df5f..31fa4e25a1 100644 --- a/resources/profiles/BBL/filament/Bambu ABS @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu ABS @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSB00_10", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS-GF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu ABS-GF @BBL P2S.json index 0e8b03a063..6e921bdcc0 100644 --- a/resources/profiles/BBL/filament/Bambu ABS-GF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu ABS-GF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSB50_04", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.2 nozzle.json index d93ebff0f4..53676c7bc2 100644 --- a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.2 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSB01_15", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.4 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.4 nozzle.json index 8751a771b7..b06aaf1b4a 100644 --- a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.4 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.4 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSB01_16", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.6 nozzle.json index 6b8e36bb44..463333a491 100644 --- a/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.6 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ASA @BBL P2S 0.6 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSB01_14", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-Aero @BBL P2S.json b/resources/profiles/BBL/filament/Bambu ASA-Aero @BBL P2S.json index 3a8ecc97b9..592b65fef4 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-Aero @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu ASA-Aero @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSB02_04", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.4 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.4 nozzle.json index eb7f04ca4e..30b6e616e6 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.4 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.4 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSB51_08", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.6 nozzle.json index 49b0a84c3c..fdff13b164 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.6 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu ASA-CF @BBL P2S 0.6 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSB51_09", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu PA-CF @BBL P2S.json index 5459a2e484..2d6934a50f 100644 --- a/resources/profiles/BBL/filament/Bambu PA-CF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu PA-CF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSN03_03", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.6 nozzle.json index 1f5d9d345e..20193526c3 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.6 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.6 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSN05_25", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.8 nozzle.json index 3c469c04ec..a7945881c9 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.8 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S 0.8 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSN05_26", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S.json index 8fe541f028..4ba451c4b5 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu PA6-CF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSN05_05", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-GF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu PA6-GF @BBL P2S.json index 88ec94b226..dcfec62f7a 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-GF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu PA6-GF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSN08_04", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.6 nozzle.json index 6bf14f208f..f133eedc1d 100644 --- a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.6 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.6 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSN04_27", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.8 nozzle.json index 256de3bf41..e0cab2e004 100644 --- a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.8 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S 0.8 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSN04_28", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S.json index 1adc791245..90443c1446 100644 --- a/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu PAHT-CF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSN04_02", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu PPA-CF @BBL P2S.json b/resources/profiles/BBL/filament/Bambu PPA-CF @BBL P2S.json index fca2ea793b..01846e0988 100644 --- a/resources/profiles/BBL/filament/Bambu PPA-CF @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu PPA-CF @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSN06_03", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu Support For PA PET @BBL P2S.json b/resources/profiles/BBL/filament/Bambu Support For PA PET @BBL P2S.json index 21492b5673..d8a299efd2 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PA PET @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu Support For PA PET @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSS03_04", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.6 nozzle.json index efa5fbedf2..1f48d62041 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.6 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.6 nozzle.json @@ -6,6 +6,8 @@ "setting_id": "GFSS06_21", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.8 nozzle.json index d0ebd6307d..95161a1a3e 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.8 nozzle.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S 0.8 nozzle.json @@ -6,6 +6,7 @@ "setting_id": "GFSS06_22", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S.json b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S.json index 67492a22da..bc11aaa193 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @BBL P2S.json @@ -6,6 +6,8 @@ "setting_id": "GFSS06_03", "instantiation": "true", "activate_air_filtration": [ + "0", + "0", "0" ], "chamber_temperatures": [ diff --git a/resources/profiles/BBL/process/0.20mm Steady @BBL A2L.json b/resources/profiles/BBL/process/0.20mm Steady @BBL A2L.json index 826648ffde..10776c396d 100644 --- a/resources/profiles/BBL/process/0.20mm Steady @BBL A2L.json +++ b/resources/profiles/BBL/process/0.20mm Steady @BBL A2L.json @@ -86,7 +86,7 @@ ], "print_extruder_variant": [ "Direct Drive Standard", - "Direct Drive TPU285" + "Direct Drive High Flow" ], "slowdown_end_acc": [ "2000", diff --git a/resources/profiles/BIQU.json b/resources/profiles/BIQU.json index 2dd4115290..1230988a61 100644 --- a/resources/profiles/BIQU.json +++ b/resources/profiles/BIQU.json @@ -1,6 +1,6 @@ { "name": "BIQU", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "BIQU configurations", "machine_model_list": [ diff --git a/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json b/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json index 1f98c673e8..40e597b6e2 100644 --- a/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json +++ b/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json @@ -24,45 +24,59 @@ ], "gcode_flavor": "marlin", "machine_max_acceleration_e": [ + "10000", "10000" ], "machine_max_acceleration_extruding": [ + "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", "1000" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "10", "10" ], "machine_max_jerk_y": [ + "10", "10" ], "machine_max_jerk_z": [ + "0.3", "0.3" ], "machine_max_junction_deviation": [ diff --git a/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json b/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json index 8acfe76925..ecd11d7c5a 100644 --- a/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json +++ b/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json @@ -24,45 +24,59 @@ ], "gcode_flavor": "marlin", "machine_max_acceleration_e": [ + "10000", "10000" ], "machine_max_acceleration_extruding": [ + "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", "1000" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "10", "10" ], "machine_max_jerk_y": [ + "10", "10" ], "machine_max_jerk_z": [ + "0.3", "0.3" ], "machine_max_junction_deviation": [ diff --git a/resources/profiles/Blocks.json b/resources/profiles/Blocks.json index 4c4936ab28..e4dc6527a7 100644 --- a/resources/profiles/Blocks.json +++ b/resources/profiles/Blocks.json @@ -1,6 +1,6 @@ { "name": "Blocks", - "version": "02.04.00.13", + "version": "02.04.00.14", "force_update": "0", "description": "Blocks configurations", "machine_model_list": [ diff --git a/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json index 7ce4729e96..5ce6d8bed6 100644 --- a/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks ABS @Blocks_RD50_V2", + "renamed_from": "Blocks Generic ABS;Generic ABS @Blocks", "inherits": "Blocks ABS @base", "from": "system", "setting_id": "qhQ0qQDGJgsueCAF", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic ABS;Generic ABS @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json index bab020171f..99671f2d3d 100644 --- a/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks ASA @Blocks_RD50_V2", + "renamed_from": "Blocks Generic ASA;Generic ASA @Blocks", "inherits": "Blocks ASA @base", "from": "system", "setting_id": "HW7xDXThvpVFbMq5", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic ASA;Generic ASA @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json index bdfb288047..83929ad9b2 100644 --- a/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks ASA-CF @Blocks_RD50_V2", + "renamed_from": "Blocks Generic ASA-CF;Generic ASA-CF @Blocks", "inherits": "Blocks ASA-CF @base", "from": "system", "setting_id": "x5ksnGLGGy1PgDns", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic ASA-CF;Generic ASA-CF @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json index 6486ec0ed8..f3b3e9e2ac 100644 --- a/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PA @Blocks_RD50_V2", + "renamed_from": "Blocks Generic PA;Generic PA @Blocks", "inherits": "Blocks PA @base", "from": "system", "setting_id": "gxD81n2jjrReLD29", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic PA;Generic PA @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json index 1946ce16b6..174ffbab6d 100644 --- a/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PA-CF @Blocks_RD50_V2", + "renamed_from": "Blocks Generic PA-CF;Generic PA-CF @Blocks", "inherits": "Blocks PA-CF @base", "from": "system", "setting_id": "EtbeKx3rbhUo1TtM", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic PA-CF;Generic PA-CF @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json index cdeec3a9aa..4fe1758a1d 100644 --- a/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PC @Blocks_RD50_V2", + "renamed_from": "Blocks Generic PC;Generic PC @Blocks", "inherits": "Blocks PC @base", "from": "system", "setting_id": "HLc0shWnKwJzSFyW", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic PC;Generic PC @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json index 3a6619c8ef..8dab9e61d2 100644 --- a/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PETG @Blocks_Pro_S100", + "renamed_from": "Blocks Generic PETG;Generic PETG @Blocks", "inherits": "Blocks PETG @base", "from": "system", "setting_id": "AhMR49fcFqtrQ6hI", @@ -11,6 +12,5 @@ "BLOCKS Pro S100 0.8 nozzle", "BLOCKS Pro S100 1.0 nozzle", "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "Blocks Generic PETG;Generic PETG @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json index 64f6bbefa0..d68c94d143 100644 --- a/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PLA @Blocks_Pro_S100", + "renamed_from": "Blocks Generic PLA;Generic PLA @Blocks", "inherits": "Blocks PLA @base", "from": "system", "setting_id": "vWojuLYIfduLGFLL", @@ -11,6 +12,5 @@ "BLOCKS Pro S100 0.8 nozzle", "BLOCKS Pro S100 1.0 nozzle", "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "Blocks Generic PLA;Generic PLA @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json index 08050266b7..690779dfdb 100644 --- a/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PLA-CF @Blocks_RD50_V2", + "renamed_from": "Blocks Generic PLA-CF;Generic PLA-CF @Blocks", "inherits": "Blocks PLA-CF @base", "from": "system", "setting_id": "lhBtMKP1DmOB3HOI", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic PLA-CF;Generic PLA-CF @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json index f1beff3b23..c000e8bc7d 100644 --- a/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json +++ b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks PVA @Blocks_RD50_V2", + "renamed_from": "Blocks Generic PVA;Generic PVA @Blocks", "inherits": "Blocks PVA @base", "from": "system", "setting_id": "hREDqwKF6qyKkakp", @@ -9,6 +10,5 @@ "BLOCKS RD50 V2 0.4 nozzle", "BLOCKS RD50 V2 0.6 nozzle", "BLOCKS RD50 V2 0.8 nozzle" - ], - "renamed_from": "Blocks Generic PVA;Generic PVA @Blocks" + ] } diff --git a/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json index d186e824ef..c397c06bb6 100644 --- a/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Blocks TPU @Blocks_Pro_S100", + "renamed_from": "Blocks Generic TPU;Generic TPU @Blocks", "inherits": "Blocks TPU @base", "from": "system", "setting_id": "6Rkz2je91JRTRoTi", @@ -11,6 +12,5 @@ "BLOCKS Pro S100 0.8 nozzle", "BLOCKS Pro S100 1.0 nozzle", "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "Blocks Generic TPU;Generic TPU @Blocks" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json index 9e523ef843..00954cc1c3 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json @@ -39,15 +39,19 @@ "20000" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ], "retraction_length": [ diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json index b0dbc7d2b9..930d7591f3 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json @@ -39,15 +39,19 @@ "20000" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ], "retraction_length": [ diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json index c361a8da16..dc1b704a9e 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json @@ -39,15 +39,19 @@ "20000" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ], "retraction_length": [ diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json index d5a27fa23b..8b7704a63a 100644 --- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100", + "renamed_from": "0.20mm Standard 0.4 nozzle @Blocks", "inherits": "fdm_process_blocks_common", "from": "system", "setting_id": "QSEguMMChNFZsK5H", @@ -10,6 +11,5 @@ "top_shell_layers": "5", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard 0.4 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json index 2716ce0c66..2bf1bc9b85 100644 --- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100", + "renamed_from": "0.24mm Draft 0.4 nozzle @Blocks", "inherits": "fdm_process_blocks_common", "from": "system", "setting_id": "uALfEFHGmup6vBYI", @@ -10,6 +11,5 @@ "top_shell_layers": "5", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ], - "renamed_from": "0.24mm Draft 0.4 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json index c67ebf9341..eb2adc5e66 100644 --- a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100", + "renamed_from": "0.30mm Extra Draft 0.4 nozzle @Blocks", "inherits": "fdm_process_blocks_common", "from": "system", "setting_id": "HYKF5l2OGvpugSQy", @@ -10,6 +11,5 @@ "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ], - "renamed_from": "0.30mm Extra Draft 0.4 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json index bbd486176f..43c66f8978 100644 --- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100", + "renamed_from": "0.30mm Optimal 0.8 nozzle @Blocks", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", "setting_id": "OUfZvizM5MGnvHfp", @@ -10,6 +11,5 @@ "layer_height": "0.3", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ], - "renamed_from": "0.30mm Optimal 0.8 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json index e7ce874a77..be8a15f243 100644 --- a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100", + "renamed_from": "0.30mm Optimal 1.0 nozzle @Blocks", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", "setting_id": "HGG9WxKVr89qNFDx", @@ -10,6 +11,5 @@ "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ], - "renamed_from": "0.30mm Optimal 1.0 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json index 00e37a7860..bdcc3d2f22 100644 --- a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100", + "renamed_from": "0.30mm Standard 0.6 nozzle @Blocks", "inherits": "fdm_process_common 0.6 nozzle", "from": "system", "setting_id": "gO2I1YjBl4nf8yzr", @@ -10,6 +11,5 @@ "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 0.6 nozzle" - ], - "renamed_from": "0.30mm Standard 0.6 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json index 915d160b6c..6613c55d57 100644 --- a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100", + "renamed_from": "0.40mm Draft 0.6 nozzle @Blocks", "inherits": "fdm_process_common 0.6 nozzle", "from": "system", "setting_id": "OjsLUl1heqv1cevs", @@ -10,6 +11,5 @@ "layer_height": "0.40", "compatible_printers": [ "BLOCKS Pro S100 0.6 nozzle" - ], - "renamed_from": "0.40mm Draft 0.6 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json index 20f02ff7af..ae0a24b261 100644 --- a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100", + "renamed_from": "0.40mm Standard 0.8 nozzle @Blocks", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", "setting_id": "laOTioBGySeudJpl", @@ -10,6 +11,5 @@ "layer_height": "0.40", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ], - "renamed_from": "0.40mm Standard 0.8 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json index 8f358e60e2..56058fc52d 100644 --- a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100", + "renamed_from": "0.50mm Draft 0.8 nozzle @Blocks", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", "setting_id": "oAhgUZdADR7kP87e", @@ -10,6 +11,5 @@ "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ], - "renamed_from": "0.50mm Draft 0.8 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json index 11c79d1a65..582cdb1043 100644 --- a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100", + "renamed_from": "0.50mm Optimal 1.2 nozzle @Blocks", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", "setting_id": "0eqNgX26jemsBfV5", @@ -10,6 +11,5 @@ "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "0.50mm Optimal 1.2 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json index 0bd91d3405..301c7d6dd7 100644 --- a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100", + "renamed_from": "0.50mm Standard 1.0 nozzle @Blocks", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", "setting_id": "z1qCW1cEMc4QvBbV", @@ -10,6 +11,5 @@ "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ], - "renamed_from": "0.50mm Standard 1.0 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json index f63ebde1bc..5d883bba1e 100644 --- a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100", + "renamed_from": "0.60mm Draft 1.0 nozzle @Blocks", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", "setting_id": "gTTgtfG8qb9My3hH", @@ -10,6 +11,5 @@ "layer_height": "0.60", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ], - "renamed_from": "0.60mm Draft 1.0 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json index ba93c393a6..326215bc82 100644 --- a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100", + "renamed_from": "0.60mm Standard 1.2 nozzle @Blocks", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", "setting_id": "ApcyToENCIANrI71", @@ -10,6 +11,5 @@ "layer_height": "0.60", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "0.60mm Standard 1.2 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json index 7950bce0ca..00eb2414a9 100644 --- a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100", + "renamed_from": "0.70mm Draft 1.2 nozzle @Blocks", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", "setting_id": "DEv7X7zaTfxRQmjo", @@ -10,6 +11,5 @@ "layer_height": "0.70", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "0.70mm Draft 1.2 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json index 49d864ed8f..393e5937de 100644 --- a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100", + "renamed_from": "0.70mm Extra Draft 1.0 nozzle @Blocks", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", "setting_id": "nUW7N9dJmTyQT4AG", @@ -10,6 +11,5 @@ "layer_height": "0.70", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ], - "renamed_from": "0.70mm Extra Draft 1.0 nozzle @Blocks" + ] } diff --git a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json index 22f7628081..45642be537 100644 --- a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json +++ b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100", + "renamed_from": "0.80mm Extra Draft 1.2 nozzle @Blocks", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", "setting_id": "JMy62SonRfK0cAdL", @@ -10,6 +11,5 @@ "layer_height": "0.80", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ], - "renamed_from": "0.80mm Extra Draft 1.2 nozzle @Blocks" + ] } diff --git a/resources/profiles/CONSTRUCT3D.json b/resources/profiles/CONSTRUCT3D.json index 55845903b0..eaa44771ea 100644 --- a/resources/profiles/CONSTRUCT3D.json +++ b/resources/profiles/CONSTRUCT3D.json @@ -1,6 +1,6 @@ { "name": "CONSTRUCT3D", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Construct3D configurations", "machine_model_list": [ diff --git a/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json b/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json index 11a7df0903..9a511418e3 100644 --- a/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic High Flow PETG @C1", - "inherits": "fdm_filament_pet", "renamed_from": "C1 Generic High Flow PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "STRDBlNRWBGfRctE", "filament_id": "OFNjku08", diff --git a/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json b/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json index dfb510e993..de2fa2b2ab 100644 --- a/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @C1", - "inherits": "fdm_filament_pet", "renamed_from": "C1 Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "v0b4nWyzRw5z5EfK", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json b/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json index 4c8a90b1de..c5474c89ff 100644 --- a/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @C1", - "inherits": "fdm_filament_pla", "renamed_from": "C1 Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "mCKOBqN6Y92a9nHV", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/CONSTRUCT3D/machine/Construct 1 0.4 nozzle.json b/resources/profiles/CONSTRUCT3D/machine/Construct 1 0.4 nozzle.json index a83c207d1d..a186f253b1 100644 --- a/resources/profiles/CONSTRUCT3D/machine/Construct 1 0.4 nozzle.json +++ b/resources/profiles/CONSTRUCT3D/machine/Construct 1 0.4 nozzle.json @@ -22,12 +22,15 @@ "nozzle_type": "hardened_steel", "thumbnails_format": "QOI", "machine_max_acceleration_e": [ + "9000", "9000" ], "machine_max_acceleration_extruding": [ + "9000", "9000" ], "machine_max_acceleration_retracting": [ + "9000", "9000" ], "machine_max_acceleration_travel": [ @@ -35,30 +38,39 @@ "1250" ], "machine_max_acceleration_x": [ + "18000", "18000" ], "machine_max_acceleration_y": [ + "18000", "18000" ], "machine_max_jerk_e": [ + "6", "6" ], "machine_max_jerk_x": [ + "25", "25" ], "machine_max_jerk_y": [ + "25", "25" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "320", "320" ], "machine_max_speed_y": [ + "320", "320" ], "machine_max_speed_z": [ + "40", "40" ], "machine_end_gcode": ";Retract the filament\nG92 E1\nG1 E-5 F900\n;Move nozzle fast\nG1 X5 Y258 F15000\n;Move Bed Down\nG1 Z180 F6000\n\n;Set machine to idle\nM104 S0\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors", diff --git a/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL 0.6 nozzle.json b/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL 0.6 nozzle.json index ca001ed3ea..51b7b0dc75 100644 --- a/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL 0.6 nozzle.json +++ b/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL 0.6 nozzle.json @@ -22,12 +22,15 @@ "nozzle_type": "hardened_steel", "thumbnails_format": "QOI", "machine_max_acceleration_e": [ + "9000", "9000" ], "machine_max_acceleration_extruding": [ + "9000", "9000" ], "machine_max_acceleration_retracting": [ + "9000", "9000" ], "machine_max_acceleration_travel": [ @@ -35,30 +38,39 @@ "1250" ], "machine_max_acceleration_x": [ + "18000", "18000" ], "machine_max_acceleration_y": [ + "18000", "18000" ], "machine_max_jerk_e": [ + "6", "6" ], "machine_max_jerk_x": [ + "25", "25" ], "machine_max_jerk_y": [ + "25", "25" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "320", "320" ], "machine_max_speed_y": [ + "320", "320" ], "machine_max_speed_z": [ + "40", "40" ], "machine_end_gcode": ";Retract the filament\nG92 E1\nG1 E-5 F900\n;Move nozzle fast\nG1 X5 Y369 F15000\n;Move Bed Down\nG1 Z400 F6000\n\n;Set machine to idle\nT-1\nM104 S0\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n", diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json index 5434e13bb8..3125f8d2e9 100644 --- a/resources/profiles/Chuanying.json +++ b/resources/profiles/Chuanying.json @@ -1,7 +1,7 @@ { "name": "Chuanying", "url": "", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Chuanying configurations", "machine_model_list": [ diff --git a/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json index f54d17ef0d..47115a5556 100644 --- a/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Chuanying X1 0.25 Nozzle", - "inherits": "Generic ABS @Chuanying", "renamed_from": "Chuanying ABS @Chuanying X1 0.25 Nozzle;Chuanying ABS Chuanying X1 0.25 Nozzle", + "inherits": "Generic ABS @Chuanying", "from": "system", "setting_id": "uHqfv6eUDzoxEkEj", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json index 570cd814df..6c2ba4bc28 100644 --- a/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json +++ b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Chuanying", - "inherits": "fdm_filament_abs", "renamed_from": "Chuanying Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "iOgVkaYF0sixbb9x", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json index 690f31669a..903dd7feb2 100644 --- a/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Chuanying X1 0.25 Nozzle", - "inherits": "Generic ASA @Chuanying", "renamed_from": "Chuanying ASA @Chuanying X1 0.25 Nozzle;Chuanying ASA Chuanying X1 0.25 Nozzle", + "inherits": "Generic ASA @Chuanying", "from": "system", "setting_id": "bVxY01TC9sAM9KQW", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json index 339fae8619..7a3e125246 100644 --- a/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic HS PLA @Chuanying X1 0.25 Nozzle", - "inherits": "Generic HS PLA @Chuanying", "renamed_from": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle;Chuanying HS PLA Chuanying X1 0.25 Nozzle", + "inherits": "Generic HS PLA @Chuanying", "from": "system", "setting_id": "gdW1LIVf6BecAtpa", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json index 88eaf57c01..c31060d7bd 100644 --- a/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Chuanying X1 0.25 Nozzle", - "inherits": "Generic PETG @Chuanying", "renamed_from": "Chuanying PETG @Chuanying X1 0.25 Nozzle;Chuanying PETG Chuanying X1 0.25 Nozzle", + "inherits": "Generic PETG @Chuanying", "from": "system", "setting_id": "YQ0HAxEDmMQgqNGY", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json index ae84fb2982..ef2c336b7f 100644 --- a/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json +++ b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Chuanying", - "inherits": "fdm_filament_pet", "renamed_from": "Chuanying Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "Mq3uwHDMub81SuRG", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json index cea064f9da..05a142627f 100644 --- a/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Chuanying X1 0.25 Nozzle", - "inherits": "Generic PLA @Chuanying", "renamed_from": "Chuanying PLA @Chuanying X1 0.25 Nozzle;Chuanying PLA Chuanying X1 0.25 Nozzle", + "inherits": "Generic PLA @Chuanying", "from": "system", "setting_id": "XsPEVGHYiyAX4YXy", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json index 3fcf7cf873..cf8b954c96 100644 --- a/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json +++ b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Chuanying", - "inherits": "fdm_filament_pla", "renamed_from": "Chuanying Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "PRk8NAihEzwi5Dqd", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json index 66d057cbf1..94f0bce238 100644 --- a/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-Silk @Chuanying X1 0.25 Nozzle", - "inherits": "Generic PLA-Silk @Chuanying", "renamed_from": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle;Chuanying PLA-SILK Chuanying X1 0.25 Nozzle", + "inherits": "Generic PLA-Silk @Chuanying", "from": "system", "setting_id": "XaGDKARkuGTTabMN", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json index 0739646658..f35355b2b7 100644 --- a/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json +++ b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-Silk @Chuanying", - "inherits": "fdm_filament_pla", "renamed_from": "Chuanying Generic PLA-Silk", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "tSCou6bWg8eY1TFn", "filament_id": "OFi6PfUM", diff --git a/resources/profiles/Co Print.json b/resources/profiles/Co Print.json index 2e1ad809eb..18902a2932 100644 --- a/resources/profiles/Co Print.json +++ b/resources/profiles/Co Print.json @@ -1,6 +1,6 @@ { "name": "Co Print", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "CoPrint configurations", "machine_model_list": [ diff --git a/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json b/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json index f047afc265..470a917e55 100644 --- a/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json +++ b/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @CoPrint", - "inherits": "Generic PLA @CoPrint", "renamed_from": "CoPrint Generic ABS", + "inherits": "Generic PLA @CoPrint", "from": "system", "setting_id": "T6mJwfI7n1YDmDzv", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json b/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json index dd2d03af04..331056a6d9 100644 --- a/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json +++ b/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @CoPrint", - "inherits": "Generic PLA @CoPrint", "renamed_from": "CoPrint Generic PETG", + "inherits": "Generic PLA @CoPrint", "from": "system", "setting_id": "99zIrGIXC9RUGDlM", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json b/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json index c25896fe55..f536912987 100644 --- a/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json +++ b/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @CoPrint", - "inherits": "Generic PLA @CoPrint", "renamed_from": "CoPrint Generic TPU", + "inherits": "Generic PLA @CoPrint", "from": "system", "setting_id": "0V6UoaCfNUIwYwah", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json index f032c9bf6e..17fe8260d1 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json @@ -29,48 +29,63 @@ "0.5" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "2500", "2500" ], "machine_max_acceleration_extruding": [ + "5000", "5000" ], "machine_max_acceleration_retracting": [ + "2500", "2500" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "5000", "5000" ], "machine_max_acceleration_y": [ + "5000", "5000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "z_hop": [ diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json index a36e231d94..e479a91cc6 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json @@ -29,48 +29,63 @@ "0.5" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "2500", "2500" ], "machine_max_acceleration_extruding": [ + "5000", "5000" ], "machine_max_acceleration_retracting": [ + "2500", "2500" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "5000", "5000" ], "machine_max_acceleration_y": [ + "5000", "5000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "z_hop": [ diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json index 2d206c1734..15620e545e 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json @@ -29,48 +29,63 @@ "0.5" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "700", "700" ], "machine_max_speed_y": [ + "700", "700" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", "20000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json index 72116fcd70..1f9cf4a9d1 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json @@ -29,48 +29,63 @@ "0.5" ], "machine_max_speed_e": [ + "100", "100" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "2500", "2500" ], "machine_max_acceleration_extruding": [ + "5000", "5000" ], "machine_max_acceleration_retracting": [ + "2500", "2500" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "5000", "5000" ], "machine_max_acceleration_y": [ + "5000", "5000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "z_hop": [ diff --git a/resources/profiles/CoLiDo.json b/resources/profiles/CoLiDo.json index 3333d2e71c..3aaee455d3 100644 --- a/resources/profiles/CoLiDo.json +++ b/resources/profiles/CoLiDo.json @@ -1,6 +1,6 @@ { "name": "CoLiDo", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "CoLiDo configurations", "machine_model_list": [ diff --git a/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json index acb6033883..cd80fbd170 100644 --- a/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @CoLiDo DIY 4.0", - "inherits": "fdm_filament_abs", "renamed_from": "CoLiDo Generic ABS @CoLiDo DIY 4.0;CoLiDo Generic ABS CoLiDo DIY 4.0", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "XLTLGUPGcCZnX5XA", "filament_id": "OFY9muEs", diff --git a/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json index aa567b7ba8..c5707a18cb 100644 --- a/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @CoLiDo X16", - "inherits": "fdm_filament_abs", "renamed_from": "CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic ABS CoLiDo X16", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "LE7jeYUNsBZEKQpJ", "filament_id": "OFY9muEs", diff --git a/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json index d70dd4d511..cf724d73c4 100644 --- a/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @CoLiDo DIY 4.0", - "inherits": "fdm_filament_pet", "renamed_from": "CoLiDo Generic PETG @CoLiDo DIY 4.0;CoLiDo Generic PETG CoLiDo DIY 4.0", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "FV2MjDSWlg3kolp3", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json index 5f68b5600b..771cbc8dd7 100644 --- a/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @CoLiDo X16", - "inherits": "fdm_filament_pet", "renamed_from": "CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic PETG CoLiDo X16", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "eX4i0rDwO3rAlQ2y", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json index 9bd8db3357..0bea71d187 100644 --- a/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @CoLiDo DIY 4.0", - "inherits": "fdm_filament_pla", "renamed_from": "CoLiDo Generic PLA @CoLiDo DIY 4.0;CoLiDo Generic PLA CoLiDo DIY 4.0", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "POF6nKughZF8OsBF", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json index f437702111..601ba78cde 100644 --- a/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @CoLiDo X16", - "inherits": "fdm_filament_pla", "renamed_from": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic PLA CoLiDo X16", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "38SFNLJEVBeAVL3B", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json index 0422f6b4c6..46dce9d565 100644 --- a/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @CoLiDo DIY 4.0", - "inherits": "fdm_filament_tpu", "renamed_from": "CoLiDo Generic TPU @CoLiDo DIY 4.0;CoLiDo Generic TPU CoLiDo DIY 4.0", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "5tJNn6c6RXqJUT2z", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json index ccf0d405b1..f1ba622d3b 100644 --- a/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @CoLiDo X16", - "inherits": "fdm_filament_tpu", "renamed_from": "CoLiDo Generic TPU @CoLiDo X16;CoLiDo Generic TPU CoLiDo X16", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "wylEuYSIKlzSVnoQ", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/CoLiDo/machine/CoLiDo 160 V2 0.4 nozzle.json b/resources/profiles/CoLiDo/machine/CoLiDo 160 V2 0.4 nozzle.json index b02f431b3e..76da0b0c03 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo 160 V2 0.4 nozzle.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo 160 V2 0.4 nozzle.json @@ -57,12 +57,15 @@ "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-3.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y0 F3000 ; park print head\nM84 ; disable motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", "1000" ], "machine_max_acceleration_travel": [ @@ -70,36 +73,47 @@ "0" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "0.4", "0.4" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "300", "300" ], "machine_max_speed_y": [ + "300", "300" ], "machine_max_speed_z": [ + "10", "10" ], "machine_min_extruding_rate": [ diff --git a/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json b/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json index 4110cbe15d..ee232937ba 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json @@ -57,12 +57,15 @@ "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-3.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y0 F3000 ; park print head\nM84 ; disable motors", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", "1000" ], "machine_max_acceleration_travel": [ @@ -70,36 +73,47 @@ "0" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "0.4", "0.4" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "300", "300" ], "machine_max_speed_y": [ + "300", "300" ], "machine_max_speed_z": [ + "10", "10" ], "machine_min_extruding_rate": [ diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json index e3eb237518..d5e20fc2da 100644 --- a/resources/profiles/Comgrow.json +++ b/resources/profiles/Comgrow.json @@ -1,6 +1,6 @@ { "name": "Comgrow", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Comgrow configurations", "machine_model_list": [ diff --git a/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json b/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json index 0494418d88..dd0b824817 100644 --- a/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json +++ b/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Comgrow", - "inherits": "fdm_filament_abs", "renamed_from": "Comgrow Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "jprGDn9oZEZu4N97", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json b/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json index 12b29d0b1d..c22a95c514 100644 --- a/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json +++ b/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Comgrow", - "inherits": "fdm_filament_pet", "renamed_from": "Comgrow Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "xi0S7KdXD7lwr3H8", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json index bde24b8ba0..cf4a01fa4f 100644 --- a/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json +++ b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Comgrow T300", - "inherits": "Generic PLA @Comgrow", "renamed_from": "Comgrow T300 PLA", + "inherits": "Generic PLA @Comgrow", "from": "system", "setting_id": "3N6gPGkzpE9CvkVz", "instantiation": "true", diff --git a/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json index 21b8e19d42..c7c5c60ca3 100644 --- a/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json +++ b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Comgrow", - "inherits": "fdm_filament_pla", "renamed_from": "Comgrow Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "oxIMSlkJ8C40mJIv", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Comgrow/machine/Comgrow T300 0.4 nozzle.json b/resources/profiles/Comgrow/machine/Comgrow T300 0.4 nozzle.json index 2453aefcab..2af8864abf 100644 --- a/resources/profiles/Comgrow/machine/Comgrow T300 0.4 nozzle.json +++ b/resources/profiles/Comgrow/machine/Comgrow T300 0.4 nozzle.json @@ -27,45 +27,59 @@ "0.8" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_x": [ + "12000", "12000" ], "machine_max_acceleration_y": [ + "12000", "12000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.25", "0.25" ], "machine_max_jerk_e": [ + "3", "3" ], "z_hop": [ diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 11647d86da..f9657c7034 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.85", + "version": "02.03.02.86", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json index 4081db783f..162ef3ddc7 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Creality Ender-3V3-all", - "inherits": "Generic ABS @Creality", "renamed_from": "Creality Generic ABS @Ender-3V3-all;Creality Generic ABS Ender-3V3-all", + "inherits": "Generic ABS @Creality", "from": "system", "setting_id": "RqMPGyaU3l17zFrA", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json index aba8475a20..f459b7cc06 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Creality Hi-all", - "inherits": "Generic ABS @Creality", "renamed_from": "Creality Generic ABS @Hi-all;Creality Generic ABS Hi-all", + "inherits": "Generic ABS @Creality", "from": "system", "setting_id": "W2NhLx7Lw4NxWJY6", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json index 0ea7629f24..384b1c3ff0 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Creality K1-all", - "inherits": "Generic ABS @Creality", "renamed_from": "Creality Generic ABS @K1-all;Creality Generic ABS K1-all", + "inherits": "Generic ABS @Creality", "from": "system", "setting_id": "9hr2XywDT7lTehYd", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json index 4aab7d7d0d..0674bc1066 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Creality K2-all", - "inherits": "Generic ABS @Creality", "renamed_from": "Creality Generic ABS @K2-all;Creality Generic ABS K2-all", + "inherits": "Generic ABS @Creality", "from": "system", "setting_id": "39krWtacUjDnf03V", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality.json b/resources/profiles/Creality/filament/Generic ABS @Creality.json index 2e0bb44fa0..622178222c 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Creality", - "inherits": "fdm_filament_abs", "renamed_from": "Creality Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "My3UvJeg30wW7hLq", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json index 0675884518..7b559b188c 100644 --- a/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Creality Ender-3V3-all", - "inherits": "Generic ASA @Creality", "renamed_from": "Creality Generic ASA @Ender-3V3-all;Creality Generic ASA Ender-3V3-all", + "inherits": "Generic ASA @Creality", "from": "system", "setting_id": "LXPKRyWzBzo9nU8k", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json index e706078d18..525e1682ac 100644 --- a/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Creality Hi-all", - "inherits": "Generic ASA @Creality", "renamed_from": "Creality Generic ASA @Hi-all;Creality Generic ASA Hi-all", + "inherits": "Generic ASA @Creality", "from": "system", "setting_id": "kcMcMJUiRgTRFe8P", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json index 91feecf436..c1b8e3e588 100644 --- a/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Creality K1-all", - "inherits": "Generic ASA @Creality", "renamed_from": "Creality Generic ASA @K1-all;Creality Generic ASA K1-all", + "inherits": "Generic ASA @Creality", "from": "system", "setting_id": "GQVdb7ZBWA55Ld0m", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json index 510e1d7660..a3b9c1bb98 100644 --- a/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Creality K2-all", - "inherits": "Generic ASA @Creality", "renamed_from": "Creality Generic ASA @K2-all;Creality Generic ASA K2-all", + "inherits": "Generic ASA @Creality", "from": "system", "setting_id": "XJKLmHYbW2ReKSKs", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic ASA @Creality.json b/resources/profiles/Creality/filament/Generic ASA @Creality.json index 0ef5d15433..3b7c470734 100644 --- a/resources/profiles/Creality/filament/Generic ASA @Creality.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Creality", - "inherits": "fdm_filament_asa", "renamed_from": "Creality Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "dCUxfG2JXDg56zTK", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json index 7a462cc250..f0fb24f465 100644 --- a/resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA-CF @Creality Hi-all", - "inherits": "Generic ASA @Creality Hi-all", "renamed_from": "Creality Generic ASA-CF @Hi-all;Creality Generic ASA-CF Hi-all", + "inherits": "Generic ASA @Creality Hi-all", "from": "system", "setting_id": "MwKV8Lh4XzvMUVYA", "filament_id": "OF53eLVD", diff --git a/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json index 152c8100d6..4619cbadef 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Creality Ender-3V3-all", - "inherits": "Generic PA-CF @Creality", "renamed_from": "Creality Generic PA-CF @Ender-3V3-all;Creality Generic PA-CF Ender-3V3-all", + "inherits": "Generic PA-CF @Creality", "from": "system", "setting_id": "L9lg0gKfwuz9xcs4", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json index 72519b07f2..23927dca0a 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Creality K1-all", - "inherits": "Generic PA-CF @Creality", "renamed_from": "Creality Generic PA-CF @K1-all;Creality Generic PA-CF K1-all", + "inherits": "Generic PA-CF @Creality", "from": "system", "setting_id": "BkM0CVxYrvFPAbpQ", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json index 932c37b2a2..7b3b8d746c 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Creality K2-all", - "inherits": "Generic PA-CF @Creality", "renamed_from": "Creality Generic PA-CF @K2-all;Creality Generic PA-CF K2-all", + "inherits": "Generic PA-CF @Creality", "from": "system", "setting_id": "jCFh6dGbNQt7YHNB", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PA-CF @Creality.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality.json index 964672343a..dfc1124f92 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @Creality.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Creality", - "inherits": "fdm_filament_pa", "renamed_from": "Creality Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "JDbda1VeHrPKR0NN", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json index a73499e2e9..684093851f 100644 --- a/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Creality K1-all", - "inherits": "Generic PC @Creality", "renamed_from": "Creality Generic PC @K1-all;Creality Generic PC K1-all", + "inherits": "Generic PC @Creality", "from": "system", "setting_id": "Jk9yNMEqu4M92edj", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json index 5cabe6f64d..039a6143bc 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Creality Ender-3V3-all", - "inherits": "Generic PETG @Creality", "renamed_from": "Creality Generic PETG @Ender-3V3-all;Creality Generic PETG Ender-3V3-all", + "inherits": "Generic PETG @Creality", "from": "system", "setting_id": "sX2aMXNynDp6VKSR", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json index 0092cf5d12..5558df0d9d 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Creality Hi-all", - "inherits": "Generic PETG @Creality", "renamed_from": "Creality Generic PETG @Hi-all;Creality Generic PETG Hi-all", + "inherits": "Generic PETG @Creality", "from": "system", "setting_id": "QcMkrViYBKh4oISG", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json index 06fb485fd0..ca5022fa42 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Creality K1-all", - "inherits": "Generic PETG @Creality", "renamed_from": "Creality Generic PETG @K1-all;Creality Generic PETG K1-all", + "inherits": "Generic PETG @Creality", "from": "system", "setting_id": "YEB1keha4rhCSmq8", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json index 87e82d3eb5..45a308e5d0 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Creality K2-all", - "inherits": "Generic PETG @Creality", "renamed_from": "Creality Generic PETG @K2-all;Creality Generic PETG K2-all", + "inherits": "Generic PETG @Creality", "from": "system", "setting_id": "IrbPRxkyhiUXaPEu", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality.json b/resources/profiles/Creality/filament/Generic PETG @Creality.json index d6b81cb3fd..f97d600565 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Creality", - "inherits": "fdm_filament_pet", "renamed_from": "Creality Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "B8lWG3jJQ4ar4j70", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json index 5049c12c57..bf246e0b8d 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Creality Hi-all", - "inherits": "Generic PETG @Creality Hi-all", "renamed_from": "Creality Generic PETG-CF @Hi-all;Creality Generic PETG-CF Hi-all", + "inherits": "Generic PETG @Creality Hi-all", "from": "system", "setting_id": "dWEGZoSVFzj7e9m1", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json index 3c2e7de2ed..7882700836 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Creality Ender-3V3-all", - "inherits": "Generic PLA @Creality", "renamed_from": "Creality Generic PLA @Ender-3V3-all;Creality Generic PLA Ender-3V3-all", + "inherits": "Generic PLA @Creality", "from": "system", "setting_id": "uGq3aWYUI2sLJORU", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json index ac6f727f02..725d4bbb18 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Creality K1-all", - "inherits": "Generic PLA @Creality", "renamed_from": "Creality Generic PLA @K1-all;Creality Generic PLA K1-all", + "inherits": "Generic PLA @Creality", "from": "system", "setting_id": "oO2HaneRPfqxNQsP", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json index bf98b76c5a..125879698b 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Creality K2-all", - "inherits": "Generic PLA @Creality", "renamed_from": "Creality Generic PLA @K2-all;Creality Generic PLA K2-all", + "inherits": "Generic PLA @Creality", "from": "system", "setting_id": "EC0PPocMp0c4O0dK", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality.json b/resources/profiles/Creality/filament/Generic PLA @Creality.json index 248ff78dcb..9ffb7083d7 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Creality", - "inherits": "fdm_filament_pla", "renamed_from": "Creality Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "UNUCEjCpe1e4ICT9", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Creality/filament/Generic PLA HF @Creality.json b/resources/profiles/Creality/filament/Generic PLA HF @Creality.json index 235e113a59..84efc28eb7 100644 --- a/resources/profiles/Creality/filament/Generic PLA HF @Creality.json +++ b/resources/profiles/Creality/filament/Generic PLA HF @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Creality", - "inherits": "fdm_filament_pla", "renamed_from": "Creality HF Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "YXqIFmq63jGbN8aZ", "filament_id": "OFZr862X", diff --git a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json index 21d1029a5d..bd353acb91 100644 --- a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Creality Ender-3V3-all", - "inherits": "Generic PLA @Creality Ender-3V3-all", "renamed_from": "Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA High Speed Ender-3V3-all", + "inherits": "Generic PLA @Creality Ender-3V3-all", "from": "system", "setting_id": "MOH1B7U4Ipv8jw0s", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json index cb184a432a..c1e482601d 100644 --- a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Creality Hi-all", - "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA High Speed @Hi-all;Creality Generic PLA High Speed Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "from": "system", "setting_id": "KJZ1ztg3jL2Cg4fi", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json index c7b2bbb03a..26b8cb5669 100644 --- a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Creality K1-all", - "inherits": "Generic PLA @Creality K1-all", "renamed_from": "Creality Generic PLA High Speed @K1-all;Creality Generic PLA High Speed K1-all", + "inherits": "Generic PLA @Creality K1-all", "from": "system", "setting_id": "5HgGIzGuma2z6vD8", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json index 9df651b17d..66d24a636e 100644 --- a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Creality K2-all", - "inherits": "Generic PLA @Creality K2-all", "renamed_from": "Creality Generic PLA High Speed @K2-all;Creality Generic PLA High Speed K2-all", + "inherits": "Generic PLA @Creality K2-all", "from": "system", "setting_id": "Lxp4EwuEZKFHZXWR", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json index 2e561af6b5..660cc0a00d 100644 --- a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Matte @Creality Ender-3V3-all", - "inherits": "Generic PLA @Creality Ender-3V3-all", "renamed_from": "Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Matte Ender-3V3-all", + "inherits": "Generic PLA @Creality Ender-3V3-all", "from": "system", "setting_id": "JlvUB8GxzpAOlgkz", "filament_id": "OFmY0l6t", diff --git a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json index 1cff84c8bf..8d2d699ae6 100644 --- a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Matte @Creality Hi-all", - "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Matte @Hi-all;Creality Generic PLA Matte Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "from": "system", "setting_id": "pFxJgjam0WAeSKqf", "filament_id": "OFmY0l6t", diff --git a/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json index 2a584450f8..77249010d5 100644 --- a/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Matte @Creality K1-all", - "inherits": "Generic PLA @Creality K1-all", "renamed_from": "Creality Generic PLA Matte @K1-all;Creality Generic PLA Matte K1-all", + "inherits": "Generic PLA @Creality K1-all", "from": "system", "setting_id": "JJRpJQcHUhelwD02", "filament_id": "OFmY0l6t", diff --git a/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json index 27607938a5..373a18ac1b 100644 --- a/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Matte @Creality K2-all", - "inherits": "Generic PLA @Creality K2-all", "renamed_from": "Creality Generic PLA Matte @K2-all;Creality Generic PLA Matte K2-all", + "inherits": "Generic PLA @Creality K2-all", "from": "system", "setting_id": "VVcXNl0Y6B0mLlrb", "filament_id": "OFmY0l6t", diff --git a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json index 1f528f79fb..d3c281ca9e 100644 --- a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Creality Ender-3V3-all", - "inherits": "Generic PLA @Creality Ender-3V3-all", "renamed_from": "Creality Generic PLA Silk @Ender-3V3-all;Creality Generic PLA Silk Ender-3V3-all", + "inherits": "Generic PLA @Creality Ender-3V3-all", "from": "system", "setting_id": "vPrmBiuBCC8843Jb", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json index 3358b98c75..3dd93ed1e9 100644 --- a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Creality Hi-all", - "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Silk @Hi-all;Creality Generic PLA Silk Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "from": "system", "setting_id": "k1ofgUXqhHGSPDPY", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json index 4e8adb2b35..947f98b81c 100644 --- a/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Creality K1-all", - "inherits": "Generic PLA @Creality K1-all", "renamed_from": "Creality Generic PLA Silk @K1-all;Creality Generic PLA Silk K1-all", + "inherits": "Generic PLA @Creality K1-all", "from": "system", "setting_id": "JcSq9nar8x5BjFss", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json index 850ea2704b..aa2de4a0bc 100644 --- a/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Creality K2-all", - "inherits": "Generic PLA @Creality K2-all", "renamed_from": "Creality Generic PLA Silk @K2-all;Creality Generic PLA Silk K2-all", + "inherits": "Generic PLA @Creality K2-all", "from": "system", "setting_id": "fRyhLWAQiCOaAxKA", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json index 62f6ddf42c..d42115e997 100644 --- a/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Wood @Creality Hi-all", - "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Wood @Hi-all;Creality Generic PLA Wood Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "from": "system", "setting_id": "PNqfF5ecYqqpobdh", "filament_id": "OFIKZxPF", diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json index 9bbc7a4433..20e6b62344 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Creality Hi-all", - "inherits": "Generic PLA-CF @Creality", "renamed_from": "Creality Generic PLA-CF @Hi-all;Creality Generic PLA-CF Hi-all", + "inherits": "Generic PLA-CF @Creality", "from": "system", "setting_id": "MH2pm9wTHLgX9fyq", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json index 2e3ed94cb7..5ff14bf8fd 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Creality K1-all", - "inherits": "Generic PLA-CF @Creality", "renamed_from": "Creality Generic PLA-CF @K1-all;Creality Generic PLA-CF K1-all", + "inherits": "Generic PLA-CF @Creality", "from": "system", "setting_id": "DoyvqW51z3o1vBSa", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json index 4cc99c0ff5..e910381ac8 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Creality K2-all", - "inherits": "Generic PLA-CF @Creality", "renamed_from": "Creality Generic PLA-CF @K2-all;Creality Generic PLA-CF K2-all", + "inherits": "Generic PLA-CF @Creality", "from": "system", "setting_id": "6KqkLBBYBA59h5TA", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json index e35a839035..b18e953e9b 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Creality", - "inherits": "fdm_filament_pla", "renamed_from": "Creality Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Fn5Z3ccrrRYFkiwT", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json b/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json index 80e07cfff0..b9f4ef02b3 100644 --- a/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json +++ b/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic Speed PLA @Creality HF", - "inherits": "fdm_filament_pla", "renamed_from": "Creality HF Generic Speed PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "pklu1YSwmDOj6gRq", "filament_id": "OFXmv5p0", diff --git a/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json index 80d3316a76..9ccaba5c4b 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Creality Ender-3V3-all", - "inherits": "Generic TPU @Creality", "renamed_from": "Creality Generic TPU @Ender-3V3-all;Creality Generic TPU Ender-3V3-all", + "inherits": "Generic TPU @Creality", "from": "system", "setting_id": "ZufJdJseoFNQC66B", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json index 1a46bfc0b5..c53515566a 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Creality Hi-all", - "inherits": "Generic TPU @Creality", "renamed_from": "Creality Generic TPU @Hi-all;Creality Generic TPU Hi-all", + "inherits": "Generic TPU @Creality", "from": "system", "setting_id": "P42mcGCETNdcZchS", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json index d2cd19bb7c..5474080ad8 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Creality K1-all", - "inherits": "Generic TPU @Creality", "renamed_from": "Creality Generic TPU @K1-all;Creality Generic TPU K1-all", + "inherits": "Generic TPU @Creality", "from": "system", "setting_id": "7zTgnS8bIEkkhqtB", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json index 9a8896ea23..f1d34a4ec7 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Creality K2-all", - "inherits": "Generic TPU @Creality", "renamed_from": "Creality Generic TPU @K2-all;Creality Generic TPU K2-all", + "inherits": "Generic TPU @Creality", "from": "system", "setting_id": "C9PAmCIDhCAthMuK", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic TPU @Creality.json b/resources/profiles/Creality/filament/Generic TPU @Creality.json index af863c3893..9edbfc1265 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Creality.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Creality", - "inherits": "fdm_filament_tpu", "renamed_from": "Creality Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "eCzlxPg3piTZEui4", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 KE-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 KE-all.json index 0df433e3db..48af68fefe 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 KE-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 KE-all.json @@ -1,120 +1,120 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Ender-3 V3 KE-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "eQu3UILWB8OQPf1X", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_max_volumetric_speed": [ - "9" - ], - "filament_retract_before_wipe": [ - "70%" - ], - "filament_retraction_length": [ - "0.8" - ], - "filament_retraction_minimum_travel": [ - "2" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "1" - ], - "filament_z_hop": [ - "0.4" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "240" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[1.0,230],[1.2,230],[1.3,240]]", - "pressure_advance": "0.09", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Ender-3 V3 KE 0.4 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Ender-3 V3 KE-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "eQu3UILWB8OQPf1X", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "filament_retract_before_wipe": [ + "70%" + ], + "filament_retraction_length": [ + "0.8" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop": [ + "0.4" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[1.0,230],[1.2,230],[1.3,240]]", + "pressure_advance": "0.09", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Ender-3 V3 KE 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 Plus-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 Plus-all.json index cfcaf8dcd4..f6942dfe46 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 Plus-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 Plus-all.json @@ -1,122 +1,122 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Ender-3 V3 Plus-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "uYReKb57FZWbcn66", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "90" - ], - "fan_min_speed": [ - "80" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "70%" - ], - "filament_retraction_length": [ - "1.2" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "1" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "240" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "14" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,220],[1.0,220],[1.2,240]]", - "pressure_advance": "0.076", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Ender-3 V3 Plus 0.4 nozzle", - "Creality Ender-3 V3 Plus 0.6 nozzle", - "Creality Ender-3 V3 Plus 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Ender-3 V3 Plus-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "uYReKb57FZWbcn66", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "80" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "70%" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "1" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "14" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,220],[1.0,220],[1.2,240]]", + "pressure_advance": "0.076", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Ender-3 V3 Plus 0.4 nozzle", + "Creality Ender-3 V3 Plus 0.6 nozzle", + "Creality Ender-3 V3 Plus 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 SE-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 SE-all.json index 07826b7931..3d934dc95b 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 SE-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3 SE-all.json @@ -1,105 +1,105 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Ender-3 V3 SE-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "IkpZHqKxz3D4DM8n", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_retraction_length": [ - "1.2" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "240" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,230],[1.0,230],[1.2,240]]", - "pressure_advance": "0.02", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Ender-3 V3 SE 0.4 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Ender-3 V3 SE-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "IkpZHqKxz3D4DM8n", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,230],[1.0,230],[1.2,240]]", + "pressure_advance": "0.02", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Ender-3 V3 SE 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3-all.json index 6cb9b5389d..ba387ef37f 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Ender-3 V3-all.json @@ -1,119 +1,119 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Ender-3 V3-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "VFPEq8OL7ibFlpNn", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "90" - ], - "fan_min_speed": [ - "80" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "30" - ], - "filament_flow_ratio": [ - "0.99" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retraction_length": [ - "1.2" - ], - "filament_retraction_speed": [ - "30" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "1.5" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "240" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "14" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,220],[1.0,220],[1.2,240]]", - "pressure_advance": "0.076", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Ender-3 V3 0.4 nozzle", - "Creality Ender-3 V3 0.6 nozzle", - "Creality Ender-3 V3 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Ender-3 V3-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "VFPEq8OL7ibFlpNn", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "80" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.99" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "1.5" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "14" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,220],[1.0,220],[1.2,240]]", + "pressure_advance": "0.076", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle", + "Creality Ender-3 V3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json index 1e77a28ccf..06a6706eeb 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json @@ -1,127 +1,127 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Hi-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "sUalM5HH0sDpMOmD", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "80" - ], - "cool_plate_temp_initial_layer": [ - "80" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "80" - ], - "eng_plate_temp_initial_layer": [ - "80" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "60" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "30" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_length": [ - "0.4" - ], - "filament_retraction_minimum_travel": [ - "2" - ], - "filament_retraction_speed": [ - "30" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "customized_plate_temp": "80", - "customized_plate_temp_initial_layer": "80", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "70", - "epoxy_resin_plate_temp_initial_layer": "70", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.6,220],[1.4,220],[1.7,250]]", - "pressure_advance": "0.06", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Hi 0.4 nozzle", - "Creality Hi 0.6 nozzle", - "Creality Hi 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Hi-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "sUalM5HH0sDpMOmD", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "customized_plate_temp": "80", + "customized_plate_temp_initial_layer": "80", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "70", + "epoxy_resin_plate_temp_initial_layer": "70", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.6,220],[1.4,220],[1.7,250]]", + "pressure_advance": "0.06", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Hi 0.4 nozzle", + "Creality Hi 0.6 nozzle", + "Creality Hi 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json index 626d34362d..267939fa6b 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json @@ -1,130 +1,130 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @K1C-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "RHcExN6yUArn3nky", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "80" - ], - "cool_plate_temp": [ - "80" - ], - "cool_plate_temp_initial_layer": [ - "80" - ], - "during_print_exhaust_fan_speed": [ - "60" - ], - "eng_plate_temp": [ - "80" - ], - "eng_plate_temp_initial_layer": [ - "80" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "30" - ], - "filament_flow_ratio": [ - "0.97" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_length": [ - "0.4" - ], - "filament_retraction_minimum_travel": [ - "2" - ], - "filament_retraction_speed": [ - "30" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "customized_plate_temp": "80", - "customized_plate_temp_initial_layer": "80", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "70", - "epoxy_resin_plate_temp_initial_layer": "70", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.8,220], [1.2,220], [1.3,250]]", - "pressure_advance": "0.054", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K1C 0.4 nozzle", - "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @K1C-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "RHcExN6yUArn3nky", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "eng_plate_temp": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "customized_plate_temp": "80", + "customized_plate_temp_initial_layer": "80", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "70", + "epoxy_resin_plate_temp_initial_layer": "70", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.8,220], [1.2,220], [1.3,250]]", + "pressure_advance": "0.054", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K1C 0.4 nozzle", + "Creality K1C 0.6 nozzle", + "Creality K1C 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Plus-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Plus-all.json index 8d1dc8a1c0..35ffc576d4 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Plus-all.json @@ -1,132 +1,132 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @K2 Plus-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "w8SHt6Slm8uIqTbh", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_minimum_travel": [ - "1" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "overhang_fan_speed": [ - "80" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "80" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "activate_chamber_temp_control": "1", - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,230],[1.2,230],[1.2,250]]", - "pressure_advance": "0.074", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle", - "Creality K2 Plus 0.6 nozzle", - "Creality K2 Plus 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @K2 Plus-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "w8SHt6Slm8uIqTbh", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "80" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "activate_chamber_temp_control": "1", + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,230],[1.2,230],[1.2,250]]", + "pressure_advance": "0.074", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle", + "Creality K2 Plus 0.6 nozzle", + "Creality K2 Plus 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Pro-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Pro-all.json index fca00e01ab..c2d411ef34 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2 Pro-all.json @@ -1,132 +1,132 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @K2 Pro-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "vI7ThHCwOBfts0NQ", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_minimum_travel": [ - "1" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "overhang_fan_speed": [ - "80" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "80" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "activate_chamber_temp_control": "1", - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,220],[1.2,220],[1.2,250]]", - "pressure_advance": "0.08", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Pro 0.4 nozzle", - "Creality K2 Pro 0.6 nozzle", - "Creality K2 Pro 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @K2 Pro-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "vI7ThHCwOBfts0NQ", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "80" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "activate_chamber_temp_control": "1", + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,220],[1.2,220],[1.2,250]]", + "pressure_advance": "0.08", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Pro 0.4 nozzle", + "Creality K2 Pro 0.6 nozzle", + "Creality K2 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json index da86d9e27e..c244600091 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json @@ -1,132 +1,132 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @K2-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "nqr9TMlkS8nLVGhG", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_minimum_travel": [ - "1" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "overhang_fan_speed": [ - "80" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "80" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "activate_chamber_temp_control": "1", - "chamber_temperature": "35", - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,230],[1.2,230],[1.2,250]]", - "pressure_advance": "0.08", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 0.4 nozzle", - "Creality K2 0.6 nozzle", - "Creality K2 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @K2-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "nqr9TMlkS8nLVGhG", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "80" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "activate_chamber_temp_control": "1", + "chamber_temperature": "35", + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,230],[1.2,230],[1.2,250]]", + "pressure_advance": "0.08", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 0.4 nozzle", + "Creality K2 0.6 nozzle", + "Creality K2 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @SPARKX i7-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @SPARKX i7-all.json index 79b83b8e69..b3b56aab4b 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @SPARKX i7-all.json @@ -1,122 +1,122 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @SPARKX i7-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "yWR45TQhsN5eYgCu", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "80" - ], - "cool_plate_temp_initial_layer": [ - "80" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "80" - ], - "eng_plate_temp_initial_layer": [ - "80" - ], - "fan_cooling_layer_time": [ - "80" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_retract_before_wipe": [ - "100%" - ], - "filament_retraction_minimum_travel": [ - "2" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "overhang_fan_speed": [ - "80" - ], - "overhang_fan_threshold": [ - "25%" - ], - "slow_down_layer_time": [ - "14" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "90" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "customized_plate_temp": "80", - "customized_plate_temp_initial_layer": "80", - "enable_pressure_advance": "1", - "epoxy_resin_plate_temp": "70", - "epoxy_resin_plate_temp_initial_layer": "70", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.6,240],[1.2,250]]", - "pressure_advance": "0.054", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality SPARKX i7 0.4 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @SPARKX i7-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "yWR45TQhsN5eYgCu", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_retract_before_wipe": [ + "100%" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "slow_down_layer_time": [ + "14" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "90" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "customized_plate_temp": "80", + "customized_plate_temp_initial_layer": "80", + "enable_pressure_advance": "1", + "epoxy_resin_plate_temp": "70", + "epoxy_resin_plate_temp_initial_layer": "70", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.6,240],[1.2,250]]", + "pressure_advance": "0.054", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality SPARKX i7 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Soleyin Basic PETG @Sermoon M300-all.json b/resources/profiles/Creality/filament/Soleyin Basic PETG @Sermoon M300-all.json index ee7263427c..52f0f070bb 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Sermoon M300-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Sermoon M300-all.json @@ -1,124 +1,124 @@ { - "type": "filament", - "name": "Soleyin Basic PETG @Sermoon M300-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "oKRNh6oI0CNy6guE", - "instantiation": "true", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "15.9" - ], - "filament_density": [ - "1.25" - ], - "filament_deretraction_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.97" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_retract_before_wipe": [ - "90%" - ], - "filament_retraction_minimum_travel": [ - "1" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "Creality" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_z_hop_types": [ - "Slope Lift" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "overhang_fan_speed": [ - "80" - ], - "overhang_fan_threshold": [ - "25%" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "enable_pressure_advance": "0", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "filament_retract_lift_above": "nil", - "filament_retract_lift_below": "nil", - "filament_retract_lift_enforce": "nil", - "material_flow_temp_graph": "[[0.5,230],[1.0,230],[1.2,250]]", - "pressure_advance": "0.075", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality Sermoon M300 0.4 nozzle", - "Creality Sermoon M300 0.6 nozzle", - "Creality Sermoon M300 0.8 nozzle" - ], - "filament_id": "OFBLktDy" -} \ No newline at end of file + "type": "filament", + "name": "Soleyin Basic PETG @Sermoon M300-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "oKRNh6oI0CNy6guE", + "filament_id": "OFBLktDy", + "instantiation": "true", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "during_print_exhaust_fan_speed": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "15.9" + ], + "filament_density": [ + "1.25" + ], + "filament_deretraction_speed": [ + "40" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retract_before_wipe": [ + "90%" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Creality" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop_types": [ + "Slope Lift" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "enable_pressure_advance": "0", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "filament_retract_lift_above": "nil", + "filament_retract_lift_below": "nil", + "filament_retract_lift_enforce": "nil", + "material_flow_temp_graph": "[[0.5,230],[1.0,230],[1.2,250]]", + "pressure_advance": "0.075", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality Sermoon M300 0.4 nozzle", + "Creality Sermoon M300 0.6 nozzle", + "Creality Sermoon M300 0.8 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json index 745ca87011..dfc4bb69a7 100644 --- a/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json @@ -1,87 +1,87 @@ { - "type": "filament", - "name": "eSUN PETG @K2 Plus-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "BHCutIIr9w5Lg1DM", - "instantiation": "true", - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "22" - ], - "filament_density": [ - "1.27" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "5" - ], - "filament_retract_before_wipe": [ - "70%" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "eSUN" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "255" - ], - "nozzle_temperature_initial_layer": [ - "255" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" - ], - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "pressure_advance": "0.1", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle" - ], - "filament_id": "OF3kBrdA" -} \ No newline at end of file + "type": "filament", + "name": "eSUN PETG @K2 Plus-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "BHCutIIr9w5Lg1DM", + "filament_id": "OF3kBrdA", + "instantiation": "true", + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "22" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "5" + ], + "filament_retract_before_wipe": [ + "70%" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "eSUN" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" + ], + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "pressure_advance": "0.1", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/eSUN PETG+HS @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PETG+HS @K2 Plus-all.json index db95688083..8862af8bdf 100644 --- a/resources/profiles/Creality/filament/eSUN PETG+HS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PETG+HS @K2 Plus-all.json @@ -1,84 +1,84 @@ { - "type": "filament", - "name": "eSUN PETG+HS @K2 Plus-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "2hnUQwzB9vx9ZUOG", - "instantiation": "true", - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "22" - ], - "filament_density": [ - "1.26" - ], - "filament_max_volumetric_speed": [ - "7" - ], - "filament_retract_before_wipe": [ - "70%" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "eSUN" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" - ], - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "pressure_advance": "0.1", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle" - ], - "filament_id": "OFrdZ0cK" -} \ No newline at end of file + "type": "filament", + "name": "eSUN PETG+HS @K2 Plus-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "2hnUQwzB9vx9ZUOG", + "filament_id": "OFrdZ0cK", + "instantiation": "true", + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "22" + ], + "filament_density": [ + "1.26" + ], + "filament_max_volumetric_speed": [ + "7" + ], + "filament_retract_before_wipe": [ + "70%" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "eSUN" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" + ], + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "pressure_advance": "0.1", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/eSUN PETG-Basic @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PETG-Basic @K2 Plus-all.json index 4885eb89a0..df6a63898a 100644 --- a/resources/profiles/Creality/filament/eSUN PETG-Basic @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PETG-Basic @K2 Plus-all.json @@ -1,87 +1,87 @@ { - "type": "filament", - "name": "eSUN PETG-Basic @K2 Plus-all", - "inherits": "fdm_filament_petg", - "from": "system", - "setting_id": "YxOoppTAD5GAFwyM", - "instantiation": "true", - "cool_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "40" - ], - "filament_cost": [ - "22" - ], - "filament_density": [ - "1.27" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "filament_retract_before_wipe": [ - "70%" - ], - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "eSUN" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "25%" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" - ], - "customized_plate_temp": "70", - "customized_plate_temp_initial_layer": "70", - "epoxy_resin_plate_temp": "60", - "epoxy_resin_plate_temp_initial_layer": "60", - "pressure_advance": "0.1", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle" - ], - "filament_id": "OFFbQscs" -} \ No newline at end of file + "type": "filament", + "name": "eSUN PETG-Basic @K2 Plus-all", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "YxOoppTAD5GAFwyM", + "filament_id": "OFFbQscs", + "instantiation": "true", + "cool_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "22" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_retract_before_wipe": [ + "70%" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "eSUN" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" + ], + "customized_plate_temp": "70", + "customized_plate_temp_initial_layer": "70", + "epoxy_resin_plate_temp": "60", + "epoxy_resin_plate_temp_initial_layer": "60", + "pressure_advance": "0.1", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/eSUN PLA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-CF @K2 Plus-all.json index e76dc3d1fa..11b8d9448e 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-CF @K2 Plus-all.json @@ -1,78 +1,78 @@ { - "type": "filament", - "name": "eSUN PLA-CF @K2 Plus-all", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "DYF2ppm40yQWEtnp", - "instantiation": "true", - "additional_cooling_fan_speed": [ - "80" - ], - "cool_plate_temp": [ - "50" - ], - "cool_plate_temp_initial_layer": [ - "50" - ], - "filament_cost": [ - "28" - ], - "filament_density": [ - "1.21" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "11" - ], - "filament_retract_before_wipe": [ - "100" - ], - "filament_retraction_length": [ - "1.2" - ], - "filament_type": [ - "PLA-CF" - ], - "filament_vendor": [ - "eSUN" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "slow_down_layer_time": [ - "6" - ], - "slow_down_min_speed": [ - "20" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" - ], - "customized_plate_temp": "50", - "customized_plate_temp_initial_layer": "50", - "epoxy_resin_plate_temp": "40", - "epoxy_resin_plate_temp_initial_layer": "40", - "pressure_advance": "0.04", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle" - ], - "filament_id": "OFnHc3D6" -} \ No newline at end of file + "type": "filament", + "name": "eSUN PLA-CF @K2 Plus-all", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "DYF2ppm40yQWEtnp", + "filament_id": "OFnHc3D6", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "50" + ], + "filament_cost": [ + "28" + ], + "filament_density": [ + "1.21" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "11" + ], + "filament_retract_before_wipe": [ + "100" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_vendor": [ + "eSUN" + ], + "hot_plate_temp": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "slow_down_layer_time": [ + "6" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "50" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" + ], + "customized_plate_temp": "50", + "customized_plate_temp_initial_layer": "50", + "epoxy_resin_plate_temp": "40", + "epoxy_resin_plate_temp_initial_layer": "40", + "pressure_advance": "0.04", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/eSUN PLA-HS @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-HS @K2 Plus-all.json index 0c540de90b..5acf20e255 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-HS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-HS @K2 Plus-all.json @@ -1,69 +1,69 @@ { - "type": "filament", - "name": "eSUN PLA-HS @K2 Plus-all", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "lJaXWbmrBmg87yhI", - "instantiation": "true", - "additional_cooling_fan_speed": [ - "80" - ], - "cool_plate_temp": [ - "50" - ], - "cool_plate_temp_initial_layer": [ - "50" - ], - "filament_cost": [ - "25" - ], - "filament_density": [ - "1.25" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "filament_retract_before_wipe": [ - "100" - ], - "filament_retraction_length": [ - "1.2" - ], - "filament_vendor": [ - "eSUN" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "slow_down_layer_time": [ - "6" - ], - "slow_down_min_speed": [ - "20" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" - ], - "customized_plate_temp": "50", - "customized_plate_temp_initial_layer": "50", - "epoxy_resin_plate_temp": "40", - "epoxy_resin_plate_temp_initial_layer": "40", - "pressure_advance": "0.04", - "default_filament_colour": "\"\"", - "compatible_printers": [ - "Creality K2 Plus 0.4 nozzle" - ], - "filament_id": "OFOHOf2F" -} \ No newline at end of file + "type": "filament", + "name": "eSUN PLA-HS @K2 Plus-all", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "lJaXWbmrBmg87yhI", + "filament_id": "OFOHOf2F", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "50" + ], + "filament_cost": [ + "25" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_retract_before_wipe": [ + "100" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_vendor": [ + "eSUN" + ], + "hot_plate_temp": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "slow_down_layer_time": [ + "6" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "50" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (layer_z > first_layer_height) }\nM104 S[nozzle_temperature]\n{else} \nM104 S[first_layer_temperature]\n{endif}" + ], + "customized_plate_temp": "50", + "customized_plate_temp_initial_layer": "50", + "epoxy_resin_plate_temp": "40", + "epoxy_resin_plate_temp_initial_layer": "40", + "pressure_advance": "0.04", + "default_filament_colour": "\"\"", + "compatible_printers": [ + "Creality K2 Plus 0.4 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/fdm_filament_hips.json b/resources/profiles/Creality/filament/fdm_filament_hips.json index c1de1560e8..a65b1977b9 100644 --- a/resources/profiles/Creality/filament/fdm_filament_hips.json +++ b/resources/profiles/Creality/filament/fdm_filament_hips.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "fdm_filament_hips", + "from": "system", "instantiation": "false", "close_fan_the_first_x_layers": [ "3" @@ -137,7 +138,6 @@ "filament_end_gcode": [ "; filament end gcode \n" ], - "from": "system", "filament_adhesiveness_category": [ "798" ], diff --git a/resources/profiles/Creality/filament/fdm_filament_petg.json b/resources/profiles/Creality/filament/fdm_filament_petg.json index c99fcf9b4e..0dcde20293 100644 --- a/resources/profiles/Creality/filament/fdm_filament_petg.json +++ b/resources/profiles/Creality/filament/fdm_filament_petg.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "fdm_filament_petg", + "from": "system", "instantiation": "false", "close_fan_the_first_x_layers": [ "3" @@ -137,7 +138,6 @@ "filament_end_gcode": [ "; filament end gcode \n" ], - "from": "system", "filament_adhesiveness_category": [ "300" ], diff --git a/resources/profiles/Creality/filament/fdm_filament_pp.json b/resources/profiles/Creality/filament/fdm_filament_pp.json index 6568654ba3..0624152b80 100644 --- a/resources/profiles/Creality/filament/fdm_filament_pp.json +++ b/resources/profiles/Creality/filament/fdm_filament_pp.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "fdm_filament_pp", + "from": "system", "instantiation": "false", "close_fan_the_first_x_layers": [ "3" @@ -137,7 +138,6 @@ "filament_end_gcode": [ "; filament end gcode \n" ], - "from": "system", "filament_adhesiveness_category": [ "902" ], diff --git a/resources/profiles/Creality/filament/fdm_filament_pps.json b/resources/profiles/Creality/filament/fdm_filament_pps.json index 65be9d03f6..62be4e2d2b 100644 --- a/resources/profiles/Creality/filament/fdm_filament_pps.json +++ b/resources/profiles/Creality/filament/fdm_filament_pps.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "fdm_filament_pps", + "from": "system", "instantiation": "false", "close_fan_the_first_x_layers": [ "3" @@ -137,7 +138,6 @@ "filament_end_gcode": [ "; filament end gcode \n" ], - "from": "system", "filament_adhesiveness_category": [ "801" ], diff --git a/resources/profiles/Creality/filament/fdm_filament_pva.json b/resources/profiles/Creality/filament/fdm_filament_pva.json index ab1694031f..c0101e0c81 100644 --- a/resources/profiles/Creality/filament/fdm_filament_pva.json +++ b/resources/profiles/Creality/filament/fdm_filament_pva.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "fdm_filament_pva", + "from": "system", "instantiation": "false", "close_fan_the_first_x_layers": [ "3" @@ -137,7 +138,6 @@ "filament_end_gcode": [ "; filament end gcode \n" ], - "from": "system", "filament_adhesiveness_category": [ "704" ], diff --git a/resources/profiles/Creality/machine/Creality CR-10 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 0.4 nozzle.json index 5da636490c..014578b914 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit
\nG1 E-2 Z1 F2400 ;Retract and raise Z
\nG1 X5 Y5 F3000 ;Wipe out
\nG1 Z10 ;Raise Z more
\nG90 ;Absolute positionning

\nG1 X0 Y0 ;Present print
\nM106 S0 ;Turn-off fan
\nM104 S0 ;Turn-off hotend
\nM140 S0 ;Turn-off bed

\nM84 X Y E ;Disable all steppers but Z
", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000,5000", - "machine_max_acceleration_extruding": "500,500", - "machine_max_acceleration_retracting": "500,1000", - "machine_max_acceleration_travel": "500,500", - "machine_max_acceleration_x": "500,500", - "machine_max_acceleration_y": "500,500", - "machine_max_acceleration_z": "500,500", - "machine_max_jerk_e": "5,5", - "machine_max_jerk_x": "10,8", - "machine_max_jerk_y": "10,8", - "machine_max_jerk_z": "0.4,0.4", - "machine_max_speed_e": "50,60", - "machine_max_speed_x": "500,500", - "machine_max_speed_y": "500,500", - "machine_max_speed_z": "10,10", + "machine_max_acceleration_e": ["5000,5000", "5000,5000"], + "machine_max_acceleration_extruding": ["500,500", "500,500"], + "machine_max_acceleration_retracting": ["500,1000", "500,1000"], + "machine_max_acceleration_travel": ["500,500", "500,500"], + "machine_max_acceleration_x": ["500,500", "500,500"], + "machine_max_acceleration_y": ["500,500", "500,500"], + "machine_max_acceleration_z": ["500,500", "500,500"], + "machine_max_jerk_e": ["5,5", "5,5"], + "machine_max_jerk_x": ["10,8", "10,8"], + "machine_max_jerk_y": ["10,8", "10,8"], + "machine_max_jerk_z": ["0.4,0.4", "0.4,0.4"], + "machine_max_speed_e": ["50,60", "50,60"], + "machine_max_speed_x": ["500,500", "500,500"], + "machine_max_speed_y": ["500,500", "500,500"], + "machine_max_speed_z": ["10,10", "10,10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25 ;pause print", diff --git a/resources/profiles/Creality/machine/Creality CR-10 Smart 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 Smart 0.4 nozzle.json index f7d9b8167e..70c7b43293 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Smart 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Smart 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit
\nG1 E-2 Z1 F2400 ;Retract and raise Z
\nG1 X5 Y5 F3000 ;Wipe out
\nG1 Z10 ;Raise Z more
\nG90 ;Absolute positionning

\nG1 X0 Y0 ;Present print
\nM106 S0 ;Turn-off fan
\nM104 S0 ;Turn-off hotend
\nM140 S0 ;Turn-off bed

\nM84 X Y E ;Disable all steppers but Z
", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000,5000", - "machine_max_acceleration_extruding": "500,500", - "machine_max_acceleration_retracting": "500,1000", - "machine_max_acceleration_travel": "500,500", - "machine_max_acceleration_x": "500,500", - "machine_max_acceleration_y": "500,500", - "machine_max_acceleration_z": "500,500", - "machine_max_jerk_e": "5,5", - "machine_max_jerk_x": "10,8", - "machine_max_jerk_y": "10,8", - "machine_max_jerk_z": "0.4,0.4", - "machine_max_speed_e": "50,60", - "machine_max_speed_x": "500,500", - "machine_max_speed_y": "500,500", - "machine_max_speed_z": "10,10", + "machine_max_acceleration_e": ["5000,5000", "5000,5000"], + "machine_max_acceleration_extruding": ["500,500", "500,500"], + "machine_max_acceleration_retracting": ["500,1000", "500,1000"], + "machine_max_acceleration_travel": ["500,500", "500,500"], + "machine_max_acceleration_x": ["500,500", "500,500"], + "machine_max_acceleration_y": ["500,500", "500,500"], + "machine_max_acceleration_z": ["500,500", "500,500"], + "machine_max_jerk_e": ["5,5", "5,5"], + "machine_max_jerk_x": ["10,8", "10,8"], + "machine_max_jerk_y": ["10,8", "10,8"], + "machine_max_jerk_z": ["0.4,0.4", "0.4,0.4"], + "machine_max_speed_e": ["50,60", "50,60"], + "machine_max_speed_x": ["500,500", "500,500"], + "machine_max_speed_y": ["500,500", "500,500"], + "machine_max_speed_z": ["10,10", "10,10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25 ;pause print", diff --git a/resources/profiles/Creality/machine/Creality CR-10 Smart Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 Smart Pro 0.4 nozzle.json index c7db2ac74f..3a65d1a6e7 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Smart Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Smart Pro 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit
\nG1 E-2 Z1 F2400 ;Retract and raise Z
\nG1 X5 Y5 F3000 ;Wipe out
\nG1 Z10 ;Raise Z more
\nG90 ;Absolute positionning

\nG1 X0 Y0 ;Present print
\nM106 S0 ;Turn-off fan
\nM104 S0 ;Turn-off hotend
\nM140 S0 ;Turn-off bed

\nM84 X Y E ;Disable all steppers but Z
", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000,5000", - "machine_max_acceleration_extruding": "500,500", - "machine_max_acceleration_retracting": "500,1000", - "machine_max_acceleration_travel": "500,500", - "machine_max_acceleration_x": "500,500", - "machine_max_acceleration_y": "500,500", - "machine_max_acceleration_z": "500,500", - "machine_max_jerk_e": "5,5", - "machine_max_jerk_x": "10,8", - "machine_max_jerk_y": "10,8", - "machine_max_jerk_z": "0.4,0.4", - "machine_max_speed_e": "50,60", - "machine_max_speed_x": "500,500", - "machine_max_speed_y": "500,500", - "machine_max_speed_z": "10,10", + "machine_max_acceleration_e": ["5000,5000", "5000,5000"], + "machine_max_acceleration_extruding": ["500,500", "500,500"], + "machine_max_acceleration_retracting": ["500,1000", "500,1000"], + "machine_max_acceleration_travel": ["500,500", "500,500"], + "machine_max_acceleration_x": ["500,500", "500,500"], + "machine_max_acceleration_y": ["500,500", "500,500"], + "machine_max_acceleration_z": ["500,500", "500,500"], + "machine_max_jerk_e": ["5,5", "5,5"], + "machine_max_jerk_x": ["10,8", "10,8"], + "machine_max_jerk_y": ["10,8", "10,8"], + "machine_max_jerk_z": ["0.4,0.4", "0.4,0.4"], + "machine_max_speed_e": ["50,60", "50,60"], + "machine_max_speed_x": ["500,500", "500,500"], + "machine_max_speed_y": ["500,500", "500,500"], + "machine_max_speed_z": ["10,10", "10,10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25 ;pause print", diff --git a/resources/profiles/Creality/machine/Creality CR-10S Pro V2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10S Pro V2 0.4 nozzle.json index 04fe4b7cfd..cd56ba7dfb 100644 --- a/resources/profiles/Creality/machine/Creality CR-10S Pro V2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10S Pro V2 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit
\nG1 E-2 Z1 F2400 ;Retract and raise Z
\nG1 X5 Y5 F3000 ;Wipe out
\nG1 Z10 ;Raise Z more
\nG90 ;Absolute positionning

\nG1 X0 Y0 ;Present print
\nM106 S0 ;Turn-off fan
\nM104 S0 ;Turn-off hotend
\nM140 S0 ;Turn-off bed

\nM84 X Y E ;Disable all steppers but Z
", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000,5000", - "machine_max_acceleration_extruding": "500,500", - "machine_max_acceleration_retracting": "500,1000", - "machine_max_acceleration_travel": "500,500", - "machine_max_acceleration_x": "500,500", - "machine_max_acceleration_y": "500,500", - "machine_max_acceleration_z": "500,500", - "machine_max_jerk_e": "5,5", - "machine_max_jerk_x": "10,8", - "machine_max_jerk_y": "10,8", - "machine_max_jerk_z": "0.4,0.4", - "machine_max_speed_e": "50,60", - "machine_max_speed_x": "500,500", - "machine_max_speed_y": "500,500", - "machine_max_speed_z": "10,10", + "machine_max_acceleration_e": ["5000,5000", "5000,5000"], + "machine_max_acceleration_extruding": ["500,500", "500,500"], + "machine_max_acceleration_retracting": ["500,1000", "500,1000"], + "machine_max_acceleration_travel": ["500,500", "500,500"], + "machine_max_acceleration_x": ["500,500", "500,500"], + "machine_max_acceleration_y": ["500,500", "500,500"], + "machine_max_acceleration_z": ["500,500", "500,500"], + "machine_max_jerk_e": ["5,5", "5,5"], + "machine_max_jerk_x": ["10,8", "10,8"], + "machine_max_jerk_y": ["10,8", "10,8"], + "machine_max_jerk_z": ["0.4,0.4", "0.4,0.4"], + "machine_max_speed_e": ["50,60", "50,60"], + "machine_max_speed_x": ["500,500", "500,500"], + "machine_max_speed_y": ["500,500", "500,500"], + "machine_max_speed_z": ["10,10", "10,10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25 ;pause print", diff --git a/resources/profiles/Creality/machine/Creality CR-20 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-20 Pro 0.4 nozzle.json index 49f85b6acc..9740c97a1a 100644 --- a/resources/profiles/Creality/machine/Creality CR-20 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-20 Pro 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "500", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["500", "500"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality CR-M4 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-M4 SE 0.4 nozzle.json index 1a6ac10bea..ca875c8184 100644 --- a/resources/profiles/Creality/machine/Creality CR-M4 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-M4 SE 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z4.5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "11", - "machine_max_acceleration_e": "8000", - "machine_max_acceleration_extruding": "8000", - "machine_max_acceleration_retracting": "8000", - "machine_max_acceleration_travel": "8000", - "machine_max_acceleration_x": "8000", - "machine_max_acceleration_y": "8000", - "machine_max_acceleration_z": "2000", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "100", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["8000", "8000"], + "machine_max_acceleration_extruding": ["8000", "8000"], + "machine_max_acceleration_retracting": ["8000", "8000"], + "machine_max_acceleration_travel": ["8000", "8000"], + "machine_max_acceleration_x": ["8000", "8000"], + "machine_max_acceleration_y": ["8000", "8000"], + "machine_max_acceleration_z": ["2000", "2000"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-2 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-2 Pro 0.4 nozzle.json index 8aa0ce3cb3..0ca93a00bf 100644 --- a/resources/profiles/Creality/machine/Creality Ender-2 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-2 Pro 0.4 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "500", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["500", "500"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Max 0.4 nozzle.json index 2c0f280ae7..dd07893bca 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Max 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "500", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["500", "500"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Max Neo 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Max Neo 0.4 nozzle.json index 8db6b4d5cc..88eaf0af7b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Max Neo 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Max Neo 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "500", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["500", "500"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Neo 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Neo 0.4 nozzle.json index d401e149e5..4ad35f9bc1 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Neo 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Neo 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit
\nG1 E-2 Z1 F2400 ;Retract and raise Z
\nG1 X5 Y5 F3000 ;Wipe out
\nG1 Z10 ;Raise Z more
\nG90 ;Absolute positionning

\nG1 X0 Y0 ;Present print
\nM106 S0 ;Turn-off fan
\nM104 S0 ;Turn-off hotend
\nM140 S0 ;Turn-off bed

\nM84 X Y E ;Disable all steppers but Z
", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000,5000", - "machine_max_acceleration_extruding": "500,500", - "machine_max_acceleration_retracting": "500,1000", - "machine_max_acceleration_travel": "500,500", - "machine_max_acceleration_x": "500,500", - "machine_max_acceleration_y": "500,500", - "machine_max_acceleration_z": "500,500", - "machine_max_jerk_e": "5,5", - "machine_max_jerk_x": "10,8", - "machine_max_jerk_y": "10,8", - "machine_max_jerk_z": "0.4,0.4", - "machine_max_speed_e": "50,60", - "machine_max_speed_x": "500,500", - "machine_max_speed_y": "500,500", - "machine_max_speed_z": "10,10", + "machine_max_acceleration_e": ["5000,5000", "5000,5000"], + "machine_max_acceleration_extruding": ["500,500", "500,500"], + "machine_max_acceleration_retracting": ["500,1000", "500,1000"], + "machine_max_acceleration_travel": ["500,500", "500,500"], + "machine_max_acceleration_x": ["500,500", "500,500"], + "machine_max_acceleration_y": ["500,500", "500,500"], + "machine_max_acceleration_z": ["500,500", "500,500"], + "machine_max_jerk_e": ["5,5", "5,5"], + "machine_max_jerk_x": ["10,8", "10,8"], + "machine_max_jerk_y": ["10,8", "10,8"], + "machine_max_jerk_z": ["0.4,0.4", "0.4,0.4"], + "machine_max_speed_e": ["50,60", "50,60"], + "machine_max_speed_x": ["500,500", "500,500"], + "machine_max_speed_y": ["500,500", "500,500"], + "machine_max_speed_z": ["10,10", "10,10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25 ;pause print", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Sonic 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Sonic 0.4 nozzle.json index c0bc21cedf..88a92fadca 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Sonic 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Sonic 0.4 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "3000", - "machine_max_acceleration_extruding": "10000", - "machine_max_acceleration_retracting": "3000", - "machine_max_acceleration_travel": "5000", - "machine_max_acceleration_x": "10000", - "machine_max_acceleration_y": "10000", - "machine_max_acceleration_z": "200", - "machine_max_jerk_e": "2.5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "2", - "machine_max_speed_e": "80", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["3000", "3000"], + "machine_max_acceleration_extruding": ["10000", "10000"], + "machine_max_acceleration_retracting": ["3000", "3000"], + "machine_max_acceleration_travel": ["5000", "5000"], + "machine_max_acceleration_x": ["10000", "10000"], + "machine_max_acceleration_y": ["10000", "10000"], + "machine_max_acceleration_z": ["200", "200"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["2", "2"], + "machine_max_speed_e": ["80", "80"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.8 nozzle.json index d075f13e04..ff02afcd42 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.8 nozzle.json @@ -31,21 +31,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "10000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "2.5", - "machine_max_jerk_x": "50", - "machine_max_jerk_y": "50", - "machine_max_jerk_z": "2", - "machine_max_speed_e": "100", - "machine_max_speed_x": "600", - "machine_max_speed_y": "600", - "machine_max_speed_z": "500", + "machine_max_acceleration_e": ["10000", "10000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["50", "50"], + "machine_max_jerk_y": ["50", "50"], + "machine_max_jerk_z": ["2", "2"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["600", "600"], + "machine_max_speed_y": ["600", "600"], + "machine_max_speed_z": ["500", "500"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE\n", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.8 nozzle.json index 713d45e321..8bc845ee6a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.8 nozzle.json @@ -32,21 +32,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "10000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "2.5", - "machine_max_jerk_x": "50", - "machine_max_jerk_y": "50", - "machine_max_jerk_z": "2", - "machine_max_speed_e": "100", - "machine_max_speed_x": "600", - "machine_max_speed_y": "600", - "machine_max_speed_z": "500", + "machine_max_acceleration_e": ["10000", "10000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["50", "50"], + "machine_max_jerk_y": ["50", "50"], + "machine_max_jerk_z": ["2", "2"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["600", "600"], + "machine_max_speed_y": ["600", "600"], + "machine_max_speed_z": ["500", "500"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE\n", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V4 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V4 0.4 nozzle.json index ce5d13c8d9..035bbf87a6 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V4 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V4 0.4 nozzle.json @@ -35,21 +35,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "126", - "machine_max_acceleration_e": "2400", - "machine_max_acceleration_extruding": "12000", - "machine_max_acceleration_retracting": "2400", - "machine_max_acceleration_travel": "12000", - "machine_max_acceleration_x": "12000", - "machine_max_acceleration_y": "12000", - "machine_max_acceleration_z": "1000", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "100", - "machine_max_jerk_y": "100", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "40", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["2400", "2400"], + "machine_max_acceleration_extruding": ["12000", "12000"], + "machine_max_acceleration_retracting": ["2400", "2400"], + "machine_max_acceleration_travel": ["12000", "12000"], + "machine_max_acceleration_x": ["12000", "12000"], + "machine_max_acceleration_y": ["12000", "12000"], + "machine_max_acceleration_z": ["1000", "1000"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["100", "100"], + "machine_max_jerk_y": ["100", "100"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["40", "40"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.4 nozzle.json index 496a977127..b4e435461b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \n \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X395 Y395 F6000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "11", - "machine_max_acceleration_e": "30000", - "machine_max_acceleration_extruding": "50000", - "machine_max_acceleration_retracting": "50000", - "machine_max_acceleration_travel": "50000", - "machine_max_acceleration_x": "50000", - "machine_max_acceleration_y": "50000", - "machine_max_acceleration_z": "1000", - "machine_max_jerk_e": "100", - "machine_max_jerk_x": "100", - "machine_max_jerk_y": "100", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "1000", - "machine_max_speed_x": "1000", - "machine_max_speed_y": "1000", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["30000", "30000"], + "machine_max_acceleration_extruding": ["50000", "50000"], + "machine_max_acceleration_retracting": ["50000", "50000"], + "machine_max_acceleration_travel": ["50000", "50000"], + "machine_max_acceleration_x": ["50000", "50000"], + "machine_max_acceleration_y": ["50000", "50000"], + "machine_max_acceleration_z": ["1000", "1000"], + "machine_max_jerk_e": ["100", "100"], + "machine_max_jerk_x": ["100", "100"], + "machine_max_jerk_y": ["100", "100"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["1000", "1000"], + "machine_max_speed_x": ["1000", "1000"], + "machine_max_speed_y": ["1000", "1000"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.6 nozzle.json index 59d08460d5..8bf84b5292 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.6 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \n \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X395 Y395 F6000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "11", - "machine_max_acceleration_e": "30000", - "machine_max_acceleration_extruding": "12000", - "machine_max_acceleration_retracting": "12000", - "machine_max_acceleration_travel": "50000", - "machine_max_acceleration_x": "12000", - "machine_max_acceleration_y": "12000", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "6", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "4", - "machine_max_speed_e": "30", - "machine_max_speed_x": "1000", - "machine_max_speed_y": "1000", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["30000", "30000"], + "machine_max_acceleration_extruding": ["12000", "12000"], + "machine_max_acceleration_retracting": ["12000", "12000"], + "machine_max_acceleration_travel": ["50000", "50000"], + "machine_max_acceleration_x": ["12000", "12000"], + "machine_max_acceleration_y": ["12000", "12000"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["6", "6"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["4", "4"], + "machine_max_speed_e": ["30", "30"], + "machine_max_speed_x": ["1000", "1000"], + "machine_max_speed_y": ["1000", "1000"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.8 nozzle.json index fcfa26e790..d01635c614 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Max 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Max 0.8 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \n \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X395 Y395 F6000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "11", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "12000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "50000", - "machine_max_acceleration_x": "12000", - "machine_max_acceleration_y": "12000", - "machine_max_acceleration_z": "200", - "machine_max_jerk_e": "3", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "3", - "machine_max_speed_e": "30", - "machine_max_speed_x": "1000", - "machine_max_speed_y": "1000", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["12000", "12000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["50000", "50000"], + "machine_max_acceleration_x": ["12000", "12000"], + "machine_max_acceleration_y": ["12000", "12000"], + "machine_max_acceleration_z": ["200", "200"], + "machine_max_jerk_e": ["3", "3"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["3", "3"], + "machine_max_speed_e": ["30", "30"], + "machine_max_speed_x": ["1000", "1000"], + "machine_max_speed_y": ["1000", "1000"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json index 66fea8f254..03a8e00895 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json @@ -20,6 +20,7 @@ "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "1000", "1000" ], "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-5 S1 Sonic 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 S1 Sonic 0.4 nozzle.json index c290f9bb9a..06c6ed6e99 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 S1 Sonic 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 S1 Sonic 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "2000", - "machine_max_acceleration_extruding": "2500", - "machine_max_acceleration_retracting": "1000", - "machine_max_acceleration_travel": "2000", - "machine_max_acceleration_x": "2500", - "machine_max_acceleration_y": "2500", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "12", - "machine_max_jerk_y": "12", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "100", - "machine_max_speed_x": "250", - "machine_max_speed_y": "250", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["2000", "2000"], + "machine_max_acceleration_extruding": ["2500", "2500"], + "machine_max_acceleration_retracting": ["1000", "1000"], + "machine_max_acceleration_travel": ["2000", "2000"], + "machine_max_acceleration_x": ["2500", "2500"], + "machine_max_acceleration_y": ["2500", "2500"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["12", "12"], + "machine_max_jerk_y": ["12", "12"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["250", "250"], + "machine_max_speed_y": ["250", "250"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json index 2acc80fe3d..4bc5847408 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json @@ -39,21 +39,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "105", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "12000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "12000", - "machine_max_acceleration_y": "12000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "2.5", - "machine_max_jerk_x": "12", - "machine_max_jerk_y": "12", - "machine_max_jerk_z": "2", - "machine_max_speed_e": "50", - "machine_max_speed_x": "300", - "machine_max_speed_y": "300", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["12000", "12000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["12000", "12000"], + "machine_max_acceleration_y": ["12000", "12000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["12", "12"], + "machine_max_jerk_y": ["12", "12"], + "machine_max_jerk_z": ["2", "2"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["300", "300"], + "machine_max_speed_y": ["300", "300"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json index dcf32371d4..74126664e2 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "105", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "12000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "12000", - "machine_max_acceleration_y": "12000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "2.5", - "machine_max_jerk_x": "12", - "machine_max_jerk_y": "12", - "machine_max_jerk_z": "2", - "machine_max_speed_e": "50", - "machine_max_speed_x": "300", - "machine_max_speed_y": "300", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["12000", "12000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["12000", "12000"], + "machine_max_acceleration_y": ["12000", "12000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["12", "12"], + "machine_max_jerk_y": ["12", "12"], + "machine_max_jerk_z": ["2", "2"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["300", "300"], + "machine_max_speed_y": ["300", "300"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C 0.4 nozzle.json index 2e96b092ab..f30d670e49 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1 SE 0.6 nozzle.json index e1212431e2..0dbe9552e5 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 SE 0.6 nozzle.json @@ -38,21 +38,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1 SE 0.8 nozzle.json index e17cfbaee4..fb2ae7bc58 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 SE 0.8 nozzle.json @@ -38,21 +38,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1 SE_CFS-C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1 SE_CFS-C 0.4 nozzle.json index aff5f6df86..1cce21a968 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE_CFS-C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 SE_CFS-C 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1C_CFS-C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1C_CFS-C 0.4 nozzle.json index 3c21fddd9e..6d51a3cea8 100644 --- a/resources/profiles/Creality/machine/Creality K1C_CFS-C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C_CFS-C 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "600", - "machine_max_speed_y": "600", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["600", "600"], + "machine_max_speed_y": ["600", "600"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1_CFS-C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1_CFS-C 0.4 nozzle.json index c19ca981f8..f53f11a029 100644 --- a/resources/profiles/Creality/machine/Creality K1_CFS-C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1_CFS-C 0.4 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "119", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K2 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K2 SE 0.4 nozzle.json index a1c33a0026..2005444a7b 100644 --- a/resources/profiles/Creality/machine/Creality K2 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 SE 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "135", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "20", - "machine_max_jerk_y": "20", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "100", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "30", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["20", "20"], + "machine_max_jerk_y": ["20", "20"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["100", "100"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["30", "30"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality SPARKX i7 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality SPARKX i7 0.2 nozzle.json index 146628aded..8f622d072d 100644 --- a/resources/profiles/Creality/machine/Creality SPARKX i7 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality SPARKX i7 0.2 nozzle.json @@ -39,21 +39,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 E-0.8 F2400 ; retract\nG2 Z{position[2]+3} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG92 E0 ; zero the extruder\n{if print_sequence == \"by object\"}\nG0 Z{max_layer_z + 1} F1800\n{endif}\nG1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "30", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "10000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "30000", - "machine_max_acceleration_x": "10000", - "machine_max_acceleration_y": "10000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "3", - "machine_max_jerk_x": "9", - "machine_max_jerk_y": "9", - "machine_max_jerk_z": "3", - "machine_max_speed_e": "14", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["10000", "10000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["30000", "30000"], + "machine_max_acceleration_x": ["10000", "10000"], + "machine_max_acceleration_y": ["10000", "10000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["3", "3"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["3", "3"], + "machine_max_speed_e": ["14", "14"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality SPARKX i7 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality SPARKX i7 0.4 nozzle.json index bf30a2ce49..34f9781bab 100644 --- a/resources/profiles/Creality/machine/Creality SPARKX i7 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality SPARKX i7 0.4 nozzle.json @@ -39,21 +39,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 E-0.8 F2400 ; retract\nG2 Z{position[2]+3} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG92 E0 ; zero the extruder\n{if print_sequence == \"by object\"}\nG0 Z{max_layer_z + 1} F1800\n{endif}\nG1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "30", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "10000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "30000", - "machine_max_acceleration_x": "10000", - "machine_max_acceleration_y": "10000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "3", - "machine_max_jerk_x": "9", - "machine_max_jerk_y": "9", - "machine_max_jerk_z": "3", - "machine_max_speed_e": "14", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["10000", "10000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["30000", "30000"], + "machine_max_acceleration_x": ["10000", "10000"], + "machine_max_acceleration_y": ["10000", "10000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["3", "3"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["3", "3"], + "machine_max_speed_e": ["14", "14"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality SPARKX i7 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality SPARKX i7 0.6 nozzle.json index e327895da7..406e50f45f 100644 --- a/resources/profiles/Creality/machine/Creality SPARKX i7 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality SPARKX i7 0.6 nozzle.json @@ -39,21 +39,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 E-0.8 F2400 ; retract\nG2 Z{position[2]+3} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG92 E0 ; zero the extruder\n{if print_sequence == \"by object\"}\nG0 Z{max_layer_z + 1} F1800\n{endif}\nG1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "30", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "10000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "30000", - "machine_max_acceleration_x": "10000", - "machine_max_acceleration_y": "10000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "3", - "machine_max_jerk_x": "9", - "machine_max_jerk_y": "9", - "machine_max_jerk_z": "3", - "machine_max_speed_e": "14", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["10000", "10000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["30000", "30000"], + "machine_max_acceleration_x": ["10000", "10000"], + "machine_max_acceleration_y": ["10000", "10000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["3", "3"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["3", "3"], + "machine_max_speed_e": ["14", "14"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality SPARKX i7 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality SPARKX i7 0.8 nozzle.json index a3fad94bab..0c4e269ea0 100644 --- a/resources/profiles/Creality/machine/Creality SPARKX i7 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality SPARKX i7 0.8 nozzle.json @@ -39,21 +39,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G1 E-0.8 F2400 ; retract\nG2 Z{position[2]+3} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG92 E0 ; zero the extruder\n{if print_sequence == \"by object\"}\nG0 Z{max_layer_z + 1} F1800\n{endif}\nG1 X0 Y180 F8000\nEND_PRINT", "machine_load_filament_time": "30", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "10000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "30000", - "machine_max_acceleration_x": "10000", - "machine_max_acceleration_y": "10000", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "3", - "machine_max_jerk_x": "9", - "machine_max_jerk_y": "9", - "machine_max_jerk_z": "3", - "machine_max_speed_e": "14", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "20", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["10000", "10000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["30000", "30000"], + "machine_max_acceleration_x": ["10000", "10000"], + "machine_max_acceleration_y": ["10000", "10000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["3", "3"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["3", "3"], + "machine_max_speed_e": ["14", "14"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["20", "20"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Sermoon D3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon D3 0.4 nozzle.json index aafe573db7..cc5faa2e2e 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon D3 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon D3 0.4 nozzle.json @@ -38,21 +38,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "500", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["500", "500"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality Sermoon D3 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon D3 Pro 0.4 nozzle.json index e82ab42245..4c19dc813d 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon D3 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon D3 Pro 0.4 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\n;G1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "5000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "3000", - "machine_max_acceleration_y": "3000", - "machine_max_acceleration_z": "100", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["5000", "5000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["3000", "3000"], + "machine_max_acceleration_y": ["3000", "3000"], + "machine_max_acceleration_z": ["100", "100"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Creality/machine/Creality Sermoon M300 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon M300 0.4 nozzle.json index bd52ae171a..05720901ca 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon M300 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon M300 0.4 nozzle.json @@ -36,21 +36,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "128", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "100", - "machine_max_jerk_y": "100", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "50", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["100", "100"], + "machine_max_jerk_y": ["100", "100"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Sermoon M300 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon M300 0.6 nozzle.json index e8cd96e845..8263db1d97 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon M300 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon M300 0.6 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "128", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "100", - "machine_max_jerk_y": "100", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "50", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["100", "100"], + "machine_max_jerk_y": ["100", "100"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Sermoon M300 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon M300 0.8 nozzle.json index 299bb1679b..7daddf2688 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon M300 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon M300 0.8 nozzle.json @@ -37,21 +37,21 @@ "machine_LED_light_exist": "0", "machine_end_gcode": "END_PRINT", "machine_load_filament_time": "128", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "20000", - "machine_max_acceleration_retracting": "5000", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "20000", - "machine_max_acceleration_y": "20000", - "machine_max_acceleration_z": "300", - "machine_max_jerk_e": "10", - "machine_max_jerk_x": "100", - "machine_max_jerk_y": "100", - "machine_max_jerk_z": "5", - "machine_max_speed_e": "50", - "machine_max_speed_x": "800", - "machine_max_speed_y": "800", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["300", "300"], + "machine_max_jerk_e": ["10", "10"], + "machine_max_jerk_x": ["100", "100"], + "machine_max_jerk_y": ["100", "100"], + "machine_max_jerk_z": ["5", "5"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["800", "800"], + "machine_max_speed_y": ["800", "800"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality Sermoon V1 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon V1 Pro 0.4 nozzle.json index 036ec9c791..ffa05ac323 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon V1 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon V1 Pro 0.4 nozzle.json @@ -38,21 +38,21 @@ "machine_LED_light_exist": "1", "machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", - "machine_max_acceleration_e": "5000", - "machine_max_acceleration_extruding": "500", - "machine_max_acceleration_retracting": "500", - "machine_max_acceleration_travel": "20000", - "machine_max_acceleration_x": "500", - "machine_max_acceleration_y": "500", - "machine_max_acceleration_z": "500", - "machine_max_jerk_e": "5", - "machine_max_jerk_x": "10", - "machine_max_jerk_y": "10", - "machine_max_jerk_z": "0.4", - "machine_max_speed_e": "50", - "machine_max_speed_x": "500", - "machine_max_speed_y": "500", - "machine_max_speed_z": "10", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["500", "500"], + "machine_max_acceleration_retracting": ["500", "500"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["500", "500"], + "machine_max_acceleration_y": ["500", "500"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_jerk_e": ["5", "5"], + "machine_max_jerk_x": ["10", "10"], + "machine_max_jerk_y": ["10", "10"], + "machine_max_jerk_z": ["0.4", "0.4"], + "machine_max_speed_e": ["50", "50"], + "machine_max_speed_x": ["500", "500"], + "machine_max_speed_y": ["500", "500"], + "machine_max_speed_z": ["10", "10"], "machine_min_extruding_rate": "0,0", "machine_min_travel_rate": "0,0", "machine_pause_gcode": "M25", diff --git a/resources/profiles/Cubicon.json b/resources/profiles/Cubicon.json index 81601bc83e..b50c3be4b7 100644 --- a/resources/profiles/Cubicon.json +++ b/resources/profiles/Cubicon.json @@ -1,6 +1,6 @@ { "name": "Cubicon", - "version": "02.04.00.07", + "version": "02.04.00.08", "force_update": "0", "description": "Cubicon configurations", "machine_model_list": [ diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle.json index 93949a7c80..03721728c7 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon ABS @base", "renamed_from": "Cubicon ABS @base", + "inherits": "Cubicon ABS @base", "setting_id": "VJEyK87ZYvHmamB9", "filament_id": "OFpDo5Ix", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json index 2788688e1b..ab66e1a8f5 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon ABS-A100 @base", "renamed_from": "Cubicon ABS-A100 @base", + "inherits": "Cubicon ABS-A100 @base", "setting_id": "OfiOryklf7FDVCz8", "filament_id": "OFy8tYJE", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle.json index cdb6324af1..913a98cfed 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon ABSk @base", "renamed_from": "Cubicon ABSk @base", + "inherits": "Cubicon ABSk @base", "setting_id": "TXcodZkab4fofnEn", "filament_id": "OForhBi4", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle.json index 09a5d917f4..7999bdd8e2 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PA-CF @base", "renamed_from": "Cubicon PA-CF @base", + "inherits": "Cubicon PA-CF @base", "setting_id": "nupuIJggdc1EKDqG", "filament_id": "OFiEz2XI", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-I 0.4 nozzle.json index e37f5f063c..6a4347591a 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PC @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PC @base", "renamed_from": "Cubicon PC @base", + "inherits": "Cubicon PC @base", "setting_id": "c0sUPS0SRYUNjEpB", "filament_id": "OFEj7sca", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle.json index db9a90c42d..d5fcedfa96 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PETG @base", "renamed_from": "Cubicon PETG @base", + "inherits": "Cubicon PETG @base", "setting_id": "dsX01tCkd2Usk104", "filament_id": "OFoBTKmn", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle.json index 3b3c9b1d4c..154c8c664f 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PLA @base", "renamed_from": "Cubicon PLA @base", + "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "xXJgHAeNf1JdCitr", "filament_id": "OFEwRwmL", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle.json index 3674c61e3f..eba57450e5 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PLA+ @base", "renamed_from": "Cubicon PLA+ @base", + "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "fNR2Bw3e4TGcWhq0", "filament_id": "OF7tt7DO", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle.json index 74bff5f995..374e068198 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", - "inherits": "Cubicon PLAi21 @base", "renamed_from": "Cubicon PLAi21 @base", + "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "vcLVF3cglagBfVAF", "filament_id": "OFRhBryT", diff --git a/resources/profiles/Custom.json b/resources/profiles/Custom.json index aceecc557a..afbcdacbe8 100644 --- a/resources/profiles/Custom.json +++ b/resources/profiles/Custom.json @@ -1,6 +1,6 @@ { "name": "Custom Printer", - "version": "02.04.00.05", + "version": "02.04.00.07", "force_update": "0", "description": "My configurations", "machine_model_list": [ diff --git a/resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json b/resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json index 615d3aafa4..3b55c98554 100644 --- a/resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "h83PqSYsAi8yZyg0", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.926", + "0.926", + "0.926" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "25" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "260", + "260", + "260" + ], + "nozzle_temperature_initial_layer": [ + "260", + "260", + "260" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json b/resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json index cef361767f..d5d74a280c 100644 --- a/resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "WllFTKxFejz4prhD", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.926", + "0.926", + "0.926" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "25" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "260", + "260", + "260" + ], + "nozzle_temperature_initial_layer": [ + "260", + "260", + "260" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PA @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PA @MyToolChanger.json index f8a3f9d4ff..047a5f4584 100644 --- a/resources/profiles/Custom/filament/Generic PA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PA @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "Lw6e7YMy0J5Flnjj", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "1", + "1", + "1" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "8", + "12", + "12" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "280", + "280", + "280" + ], + "nozzle_temperature_initial_layer": [ + "280", + "280", + "280" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json index 3db93c2e10..cc86241941 100644 --- a/resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "0NPQJ9aRrfjAqLeX", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "1", + "1", + "1" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "8", + "8", + "8" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "280", + "280", + "280" + ], + "nozzle_temperature_initial_layer": [ + "280", + "280", + "280" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json index 8fbc18b513..310d50a16d 100644 --- a/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "HMOa2jbj19Xjipt5", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.94", + "0.94", + "0.94" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "30" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "280", + "280", + "280" + ], + "nozzle_temperature_initial_layer": [ + "270", + "270", + "270" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json index faba4cf7cb..ebe6728fe9 100644 --- a/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "4qShNrl9EWAVBfeG", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "1", + "1", + "1" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "10", + "18", + "21" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "255", + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255", + "255" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json index 5f20b83ec5..557e432016 100644 --- a/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "WbAYFZdqFwEZnNAX", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "21", + "40" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "220", + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220", + "220" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json index ccfc71ebb7..f7df427b1e 100644 --- a/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "53UFt3Q63NB0ztlP", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "18", + "18" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "220", + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220", + "220" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json index 67a46e0129..dce39dc311 100644 --- a/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json @@ -6,6 +6,111 @@ "from": "system", "setting_id": "dyOUyXNOKP1VmSal", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "4", + "4", + "4" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "220", + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220", + "220" + ], "filament_cooling_final_speed": [ "3.5" ], diff --git a/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json b/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json index 2527ff824e..175174d72b 100644 --- a/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json @@ -6,7 +6,109 @@ "from": "system", "setting_id": "H45dfn4BGdLAx9nN", "instantiation": "true", + "activate_air_filtration": [ + "0", + "0", + "0" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70", + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "filament_flow_ratio": [ + "1", + "1", + "1" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retract_before_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil", + "nil" + ], + "nozzle_temperature": [ + "240", + "240", + "240" + ], + "nozzle_temperature_initial_layer": [ + "240", + "240", + "240" + ], "filament_max_volumetric_speed": [ + "3.2", + "3.2", "3.2" ], "compatible_printers": [ diff --git a/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json index c7686998c0..a692f178f8 100644 --- a/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json +++ b/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "FONwo6mjzIUC1Jfw", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Klipper Printer", "nozzle_diameter": [ "0.2" diff --git a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json index 6c5bd3fc83..20468e270a 100644 --- a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "h7lWobw9IAl6rIFf", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Klipper Printer", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json index 35a5ca033f..19dd3981dc 100644 --- a/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json +++ b/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "ealoRWEBVYdKQwY4", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Klipper Printer", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json index 1dd4e563cf..249dd7f0b3 100644 --- a/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json +++ b/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "ameNjll5Z5Ptmvko", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Klipper Printer", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json index a8cff74ece..333e6359ac 100644 --- a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "80333z8YjBojDweT", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Marlin Printer", "gcode_flavor": "marlin", "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors", @@ -13,21 +32,33 @@ "0.32" ], "retraction_length": [ + "0.9", + "0.9", "0.9" ], "retraction_minimum_travel": [ + "1", + "1", "1" ], "retraction_speed": [ + "45", + "45", "45" ], "deretraction_speed": [ + "35", + "35", "35" ], "wipe": [ + "0", + "0", "0" ], "z_hop": [ + "0.4", + "0.4", "0.4" ], "nozzle_diameter": [ diff --git a/resources/profiles/Custom/machine/MyRRF 0.4 nozzle.json b/resources/profiles/Custom/machine/MyRRF 0.4 nozzle.json index 492f696697..17c5735fa5 100644 --- a/resources/profiles/Custom/machine/MyRRF 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyRRF 0.4 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "eweNs9Rgfgftu6Nw", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic RRF Printer", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Custom/machine/MyRepetier 0.4 nozzle.json b/resources/profiles/Custom/machine/MyRepetier 0.4 nozzle.json index 0c06ed2dbe..585b444582 100644 --- a/resources/profiles/Custom/machine/MyRepetier 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyRepetier 0.4 nozzle.json @@ -5,6 +5,25 @@ "from": "system", "setting_id": "DQo4iCTagLKPE8Kv", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic Repetier Printer", "nozzle_diameter": [ "0.4" @@ -17,4 +36,4 @@ "0x250" ], "printable_height": "250" -} \ No newline at end of file +} diff --git a/resources/profiles/Custom/machine/MyRepetier.json b/resources/profiles/Custom/machine/MyRepetier.json index 7b5a291c72..2cb389a660 100644 --- a/resources/profiles/Custom/machine/MyRepetier.json +++ b/resources/profiles/Custom/machine/MyRepetier.json @@ -9,4 +9,4 @@ "bed_texture": "orcaslicer_bed_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" -} \ No newline at end of file +} diff --git a/resources/profiles/Custom/machine/MyToolChanger 0.2 nozzle.json b/resources/profiles/Custom/machine/MyToolChanger 0.2 nozzle.json index 0e7d56e99a..1cf35f8809 100644 --- a/resources/profiles/Custom/machine/MyToolChanger 0.2 nozzle.json +++ b/resources/profiles/Custom/machine/MyToolChanger 0.2 nozzle.json @@ -5,6 +5,61 @@ "from": "system", "setting_id": "BFnMQPzSH6GHG60z", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard", + "Standard" + ], + "extruder_type": [ + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic ToolChanger Printer", "nozzle_diameter": [ "0.2", diff --git a/resources/profiles/Custom/machine/MyToolChanger 0.4 nozzle.json b/resources/profiles/Custom/machine/MyToolChanger 0.4 nozzle.json index 64a50ed44e..b44db48b01 100644 --- a/resources/profiles/Custom/machine/MyToolChanger 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyToolChanger 0.4 nozzle.json @@ -5,6 +5,61 @@ "from": "system", "setting_id": "tJ98aJdTqDwMfyZd", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard", + "Standard" + ], + "extruder_type": [ + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic ToolChanger Printer", "nozzle_diameter": [ "0.4", diff --git a/resources/profiles/Custom/machine/MyToolChanger 0.6 nozzle.json b/resources/profiles/Custom/machine/MyToolChanger 0.6 nozzle.json index fc615ac3d9..d15c22ef43 100644 --- a/resources/profiles/Custom/machine/MyToolChanger 0.6 nozzle.json +++ b/resources/profiles/Custom/machine/MyToolChanger 0.6 nozzle.json @@ -5,6 +5,61 @@ "from": "system", "setting_id": "rhZgOdaU0sJu9aYF", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard", + "Standard" + ], + "extruder_type": [ + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic ToolChanger Printer", "nozzle_diameter": [ "0.6", diff --git a/resources/profiles/Custom/machine/MyToolChanger 0.8 nozzle.json b/resources/profiles/Custom/machine/MyToolChanger 0.8 nozzle.json index c019a13181..a9ac3fe999 100644 --- a/resources/profiles/Custom/machine/MyToolChanger 0.8 nozzle.json +++ b/resources/profiles/Custom/machine/MyToolChanger 0.8 nozzle.json @@ -5,6 +5,61 @@ "from": "system", "setting_id": "2rsBSbB6oAgBhyy0", "instantiation": "true", + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard", + "Standard" + ], + "extruder_type": [ + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_model": "Generic ToolChanger Printer", "nozzle_diameter": [ "0.8", diff --git a/resources/profiles/Custom/machine/fdm_klipper_common.json b/resources/profiles/Custom/machine/fdm_klipper_common.json index 0080d0ebb0..96e8888c7c 100644 --- a/resources/profiles/Custom/machine/fdm_klipper_common.json +++ b/resources/profiles/Custom/machine/fdm_klipper_common.json @@ -4,64 +4,143 @@ "inherits": "fdm_machine_common", "from": "system", "instantiation": "false", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "gcode_flavor": "klipper", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_e": [ + "25", + "25", + "25", + "25", "25", "25" ], "machine_max_speed_x": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", "0.2", "0.4" ], @@ -87,39 +166,65 @@ "printer_technology": "FFF", "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", + "1", "1" ], "retract_before_wipe": [ + "70%", + "70%", "70%" ], "retract_when_changing_layer": [ + "1", + "1", "1" ], "retraction_length": [ + "0.8", + "0.8", "0.8" ], "retract_length_toolchange": [ + "2", + "2", "2" ], "z_hop": [ + "0.4", + "0.4", "0.4" ], "retract_restart_extra": [ + "0", + "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", "0" ], "retraction_speed": [ + "30", + "30", "30" ], "deretraction_speed": [ + "30", + "30", "30" ], - "z_hop_types": "Slope Lift", + "z_hop_types": [ + "Slope Lift", + "Slope Lift", + "Slope Lift" + ], "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": [ + "1", + "1", "1" ], "default_filament_profile": [ @@ -135,6 +240,10 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_pause_gcode": "PAUSE", "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0" } diff --git a/resources/profiles/Custom/machine/fdm_machine_common.json b/resources/profiles/Custom/machine/fdm_machine_common.json index bf8f2249cf..10f65cdf80 100644 --- a/resources/profiles/Custom/machine/fdm_machine_common.json +++ b/resources/profiles/Custom/machine/fdm_machine_common.json @@ -3,8 +3,29 @@ "name": "fdm_machine_common", "from": "system", "instantiation": "false", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "printer_technology": "FFF", "deretraction_speed": [ + "40", + "40", "40" ], "extruder_colour": [ @@ -15,45 +36,115 @@ ], "gcode_flavor": "marlin", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "10000", + "10000", + "10000", + "10000", + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "1000", + "1000", + "1000", + "1000", + "1000", "1000" ], "machine_max_acceleration_x": [ + "10000", + "10000", + "10000", + "10000", + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", + "10000", + "10000", + "10000", + "10000", "10000" ], "machine_max_acceleration_z": [ + "500", + "500", + "500", + "500", + "500", "500" ], "machine_max_speed_e": [ + "60", + "60", + "60", + "60", + "60", "60" ], "machine_max_speed_x": [ + "500", + "500", + "500", + "500", + "500", "500" ], "machine_max_speed_y": [ + "500", + "500", + "500", + "500", + "500", "500" ], "machine_max_speed_z": [ + "10", + "10", + "10", + "10", + "10", "10" ], "machine_max_jerk_e": [ + "5", + "5", + "5", + "5", + "5", "5" ], "machine_max_jerk_x": [ + "8", + "8", + "8", + "8", + "8", "8" ], "machine_max_jerk_y": [ + "8", + "8", + "8", + "8", + "8", "8" ], "machine_max_jerk_z": [ + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", "0.4" ], "machine_min_extruding_rate": [ @@ -78,35 +169,55 @@ "printer_settings_id": "", "printer_variant": "0.4", "retraction_minimum_travel": [ + "2", + "2", "2" ], "retract_before_wipe": [ + "70%", + "70%", "70%" ], "retract_when_changing_layer": [ + "1", + "1", "1" ], "retraction_length": [ + "1", + "1", "1" ], "retract_length_toolchange": [ + "1", + "1", "1" ], "z_hop": [ + "0", + "0", "0" ], "retract_restart_extra": [ + "0", + "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", "0" ], "retraction_speed": [ + "60", + "60", "60" ], "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": [ + "1", + "1", "1" ], "default_print_profile": "", diff --git a/resources/profiles/Custom/machine/fdm_repetier_common.json b/resources/profiles/Custom/machine/fdm_repetier_common.json index 27b4dd7741..7cb3faf648 100644 --- a/resources/profiles/Custom/machine/fdm_repetier_common.json +++ b/resources/profiles/Custom/machine/fdm_repetier_common.json @@ -4,66 +4,145 @@ "inherits": "fdm_machine_common", "from": "system", "instantiation": "false", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "gcode_flavor": "repetier", "disable_m73": "1", "emit_machine_limits_to_gcode": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_e": [ + "25", + "25", + "25", + "25", "25", "25" ], "machine_max_speed_x": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", "0.2", "0.4" ], @@ -89,39 +168,65 @@ "printer_technology": "FFF", "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", + "1", "1" ], "retract_before_wipe": [ + "70%", + "70%", "70%" ], "retract_when_changing_layer": [ + "1", + "1", "1" ], "retraction_length": [ + "0.8", + "0.8", "0.8" ], "retract_length_toolchange": [ + "2", + "2", "2" ], "z_hop": [ + "0.4", + "0.4", "0.4" ], "retract_restart_extra": [ + "0", + "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", "0" ], "retraction_speed": [ + "30", + "30", "30" ], "deretraction_speed": [ + "30", + "30", "30" ], - "z_hop_types": "Slope Lift", + "z_hop_types": [ + "Slope Lift", + "Slope Lift", + "Slope Lift" + ], "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": [ + "1", + "1", "1" ], "default_filament_profile": [ @@ -137,6 +242,10 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_pause_gcode": "G91\nG1 Z10 F900\nG90\nG1 X0 Y0 F6000\n", "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0" } diff --git a/resources/profiles/Custom/machine/fdm_rrf_common.json b/resources/profiles/Custom/machine/fdm_rrf_common.json index e9a1301622..e85c6977ad 100644 --- a/resources/profiles/Custom/machine/fdm_rrf_common.json +++ b/resources/profiles/Custom/machine/fdm_rrf_common.json @@ -4,64 +4,143 @@ "inherits": "fdm_machine_common", "from": "system", "instantiation": "false", + "default_nozzle_volume_type": [ + "Standard" + ], + "extruder_type": [ + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "gcode_flavor": "reprapfirmware", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_e": [ + "25", + "25", + "25", + "25", "25", "25" ], "machine_max_speed_x": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", "0.2", "0.4" ], @@ -87,39 +166,65 @@ "printer_technology": "FFF", "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", + "1", "1" ], "retract_before_wipe": [ + "70%", + "70%", "70%" ], "retract_when_changing_layer": [ + "1", + "1", "1" ], "retraction_length": [ + "0.8", + "0.8", "0.8" ], "retract_length_toolchange": [ + "2", + "2", "2" ], "z_hop": [ + "0.4", + "0.4", "0.4" ], "retract_restart_extra": [ + "0", + "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", "0" ], "retraction_speed": [ + "30", + "30", "30" ], "deretraction_speed": [ + "30", + "30", "30" ], - "z_hop_types": "Slope Lift", + "z_hop_types": [ + "Slope Lift", + "Slope Lift", + "Slope Lift" + ], "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": [ + "1", + "1", "1" ], "default_filament_profile": [ @@ -130,7 +235,11 @@ "0x0" ], "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0", "machine_start_gcode": "; Prime Filament Sensor for Runout\nM581 P1 T2 S-1 R0\nM950 J1 C\"nil\" ; Input 1 e0 Filament Sensor \nM591 D0 P2 C\"e0stop\" S1 ; Filament Runout Sensor\n\nM83 ; extruder relative mode\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 S140 ; Set extruder temp 140C before bed level\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\n;G28 W\nG32 ; Levels Z Tilt and probes Z=0\nG29 S0 ; mesh bed leveling\nG1 X0 Y0 Z2 F2000\nM109 S[first_layer_temperature] ; wait for extruder temp\n\nG1 X10 Y-7 Z0.3 F1000.0 ; go outside print area\nG92 E0.0\nG1 Z0.2 E8 ; Purge Bubble\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors", diff --git a/resources/profiles/Custom/machine/fdm_toolchanger_common.json b/resources/profiles/Custom/machine/fdm_toolchanger_common.json index 55f1b2cadb..3efd27245a 100644 --- a/resources/profiles/Custom/machine/fdm_toolchanger_common.json +++ b/resources/profiles/Custom/machine/fdm_toolchanger_common.json @@ -4,6 +4,541 @@ "inherits": "fdm_klipper_common", "from": "system", "instantiation": "false", + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard", + "Standard" + ], + "extruder_type": [ + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive", + "Direct Drive" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow", + "Direct Drive Standard,Direct Drive High Flow,Direct Drive Extra High Flow" + ], + "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4" + ], + "machine_max_speed_e": [ + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25" + ], + "machine_max_speed_x": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12" + ], + "printer_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "gcode_flavor": "klipper", "single_extruder_multi_material": "0", "wait_for_temp_on_wipe_tower": "1", @@ -26,6 +561,16 @@ "0.08" ], "deretraction_speed": [ + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", "30", "30", "30", @@ -47,6 +592,16 @@ "0x0" ], "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", "0", "0", "0", @@ -61,6 +616,16 @@ "0.4" ], "retract_before_wipe": [ + "70%", + "70%", + "70%", + "70%", + "70%", + "70%", + "70%", + "70%", + "70%", + "70%", "70%", "70%", "70%", @@ -68,6 +633,16 @@ "70%" ], "retract_length_toolchange": [ + "2", + "2", + "2", + "2", + "2", + "2", + "2", + "2", + "2", + "2", "2", "2", "2", @@ -75,6 +650,16 @@ "2" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", "0", "0", "0", @@ -82,6 +667,16 @@ "0" ], "retract_lift_below": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", "0", "0", "0", @@ -89,6 +684,16 @@ "0" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", @@ -96,6 +701,16 @@ "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", "0", "0", "0", @@ -103,6 +718,16 @@ "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", "0", "0", "0", @@ -110,6 +735,16 @@ "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", "1", "1", "1", @@ -117,6 +752,16 @@ "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", + "18", + "18", + "18", + "18", + "18", "18", "18", "18", @@ -124,6 +769,16 @@ "18" ], "retraction_length": [ + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", "0.8", "0.8", "0.8", @@ -131,6 +786,16 @@ "0.8" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", "1", "1", "1", @@ -138,6 +803,16 @@ "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", "30", "30", "30", @@ -145,6 +820,16 @@ "30" ], "travel_slope": [ + "3", + "3", + "3", + "3", + "3", + "3", + "3", + "3", + "3", + "3", "3", "3", "3", @@ -152,6 +837,16 @@ "3" ], "wipe": [ + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", "1", "1", "1", @@ -159,6 +854,16 @@ "1" ], "wipe_distance": [ + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", "1", "1", "1", @@ -166,6 +871,16 @@ "1" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", @@ -173,6 +888,16 @@ "0.4" ], "z_hop_types": [ + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", + "Slope Lift", "Slope Lift", "Slope Lift", "Slope Lift", @@ -184,6 +909,22 @@ "change_filament_gcode": "", "machine_start_gcode": "PRINT_START TOOL_TEMP={first_layer_temperature[initial_tool]} {if is_extruder_used[0]}T0_TEMP={first_layer_temperature[0]}{endif} {if is_extruder_used[1]}T1_TEMP={first_layer_temperature[1]}{endif} {if is_extruder_used[2]}T2_TEMP={first_layer_temperature[2]}{endif} {if is_extruder_used[3]}T3_TEMP={first_layer_temperature[3]}{endif} {if is_extruder_used[4]}T4_TEMP={first_layer_temperature[4]}{endif} {if is_extruder_used[5]}T5_TEMP={first_layer_temperature[5]}{endif} BED_TEMP=[first_layer_bed_temperature] TOOL=[initial_tool]\n\nM83\n; set extruder temp\n{if first_layer_temperature[0] > 0 and (is_extruder_used[0])}M104 T0 S{first_layer_temperature[0]}{endif}\n{if first_layer_temperature[1] > 0 and (is_extruder_used[1])}M104 T1 S{first_layer_temperature[1]}{endif}\n{if first_layer_temperature[2] > 0 and (is_extruder_used[2])}M104 T2 S{first_layer_temperature[2]}{endif}\n{if first_layer_temperature[3] > 0 and (is_extruder_used[3])}M104 T3 S{first_layer_temperature[3]}{endif}\n{if first_layer_temperature[4] > 0 and (is_extruder_used[4])}M104 T4 S{first_layer_temperature[4]}{endif}\n{if (is_extruder_used[0]) and initial_tool != 0}\n;\n; purge first tool\n;\nG1 F{travel_speed * 60}\nM109 T0 S{first_layer_temperature[0]}\nT0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(0 == 0 ? 0 : (0 == 1 ? 120 : (0 == 2 ? 180 : 300)))} Y{(0 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[0]}10{else}30{endif} X40 Z0.2 F{if filament_multitool_ramming[0]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X40 E9 F800 ; continue purging and wipe the nozzle\nG0 X{40 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{40 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[0]} F2400 ; retract\n{e_retracted[0] = 1.5 * retract_length[0]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[0] == 0 ? (first_layer_temperature[0] + standby_temperature_delta) : (idle_temperature[0]))} T0\n{endif}\n{if (is_extruder_used[1]) and initial_tool != 1}\n;\n; purge second tool\n;\nG1 F{travel_speed * 60}\nM109 T1 S{first_layer_temperature[1]}\nT1; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(1 == 0 ? 0 : (1 == 1 ? 120 : (1 == 2 ? 180 : 300)))} Y{(1 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[1]}10{else}30{endif} X120 Z0.2 F{if filament_multitool_ramming[1]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X80 E9 F800 ; continue purging and wipe the nozzle\nG0 X{80 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{80 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[1]} F2400 ; retract\n{e_retracted[1] = 1.5 * retract_length[1]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[1] == 0 ? (first_layer_temperature[1] + standby_temperature_delta) : (idle_temperature[1]))} T1\n{endif}\n{if (is_extruder_used[2]) and initial_tool != 2}\n;\n; purge third tool\n;\nG1 F{travel_speed * 60}\nM109 T2 S{first_layer_temperature[2]}\nT2; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(2 == 0 ? 0 : (2 == 1 ? 120 : (2 == 2 ? 180 : 300)))} Y{(2 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[2]}10{else}30{endif} X220 Z0.2 F{if filament_multitool_ramming[2]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X220 E9 F800 ; continue purging and wipe the nozzle\nG0 X{220 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{220 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[2]} F2400 ; retract\n{e_retracted[2] = 1.5 * retract_length[2]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[2] == 0 ? (first_layer_temperature[2] + standby_temperature_delta) : (idle_temperature[2]))} T2\n{endif}\n{if (is_extruder_used[3]) and initial_tool != 3}\n;\n; purge fourth tool\n;\nG1 F{travel_speed * 60}\nM109 T3 S{first_layer_temperature[3]}\nT3; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(3 == 0 ? 0 : (3 == 1 ? 120 : (3 == 2 ? 180 : 300)))} Y{(3 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[3]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[3]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[3]} F2400 ; retract\n{e_retracted[3] = 1.5 * retract_length[3]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[3] == 0 ? (first_layer_temperature[3] + standby_temperature_delta) : (idle_temperature[3]))} T3\n{endif}\n{if (is_extruder_used[4]) and initial_tool != 4}\n;\n; purge fifth tool\n;\nG1 F{travel_speed * 60}\nM109 T4 S{first_layer_temperature[4]}\nT4; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(4 == 0 ? 0 : (4 == 1 ? 120 : (4 == 2 ? 180 : 300)))} Y{(4 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[4]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[4]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[4]} F2400 ; retract\n{e_retracted[4] = 1.5 * retract_length[4]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[4] == 0 ? (first_layer_temperature[4] + standby_temperature_delta) : (idle_temperature[4]))} T4\n{endif}\n;\n; purge initial tool\n;\nG1 F{travel_speed * 60}\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]}\nT{initial_tool}; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300)))} Y{(initial_tool < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[initial_tool]}10{else}30{endif} X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 10)} Z0.2 F{if filament_multitool_ramming[initial_tool]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40)} E9 F800 ; continue purging and wipe the nozzle\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3)} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3 * 2)} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[initial_tool]} F2400 ; retract\n{e_retracted[initial_tool] = 1.5 * retract_length[initial_tool]}\nG92 E0 ; reset extruder position\n", "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0" } diff --git a/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json b/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json index 4cebf36eaa..1c52b7de5d 100644 --- a/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json +++ b/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "qC4SXEgZNVB9eWNQ", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.08", "bottom_shell_layers": "7", "top_shell_layers": "9", diff --git a/resources/profiles/Custom/process/0.08mm Extra Fine @MyMarlin.json b/resources/profiles/Custom/process/0.08mm Extra Fine @MyMarlin.json index 70c78226a5..5c7847846e 100644 --- a/resources/profiles/Custom/process/0.08mm Extra Fine @MyMarlin.json +++ b/resources/profiles/Custom/process/0.08mm Extra Fine @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "F0QIJviBIYDJjJe2", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.08", "bottom_shell_layers": "7", "top_shell_layers": "9" diff --git a/resources/profiles/Custom/process/0.08mm Extra Fine @MyRRF.json b/resources/profiles/Custom/process/0.08mm Extra Fine @MyRRF.json index 1c5392cae6..54085435ad 100644 --- a/resources/profiles/Custom/process/0.08mm Extra Fine @MyRRF.json +++ b/resources/profiles/Custom/process/0.08mm Extra Fine @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "zhi1tw9y210xSTmh", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.08", "bottom_shell_layers": "7", "top_shell_layers": "9" diff --git a/resources/profiles/Custom/process/0.08mm Extra Fine @MyToolChanger.json b/resources/profiles/Custom/process/0.08mm Extra Fine @MyToolChanger.json index 17f9df6cac..d1576584e6 100644 --- a/resources/profiles/Custom/process/0.08mm Extra Fine @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.08mm Extra Fine @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "Xt1tNqoffQCMWaDF", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.08", "bottom_shell_layers": "7", "top_shell_layers": "9", diff --git a/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json b/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json index e275ffeb1a..6cfed675ba 100644 --- a/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json +++ b/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "guUxwo1j4TPACM0Z", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.12", "bottom_shell_layers": "5", "top_shell_layers": "6", diff --git a/resources/profiles/Custom/process/0.12mm Fine @MyMarlin.json b/resources/profiles/Custom/process/0.12mm Fine @MyMarlin.json index 64916a585a..6cc4a2520f 100644 --- a/resources/profiles/Custom/process/0.12mm Fine @MyMarlin.json +++ b/resources/profiles/Custom/process/0.12mm Fine @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "p7cD7BCjLQtah9z8", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.12", "bottom_shell_layers": "5", "top_shell_layers": "6" diff --git a/resources/profiles/Custom/process/0.12mm Fine @MyRRF.json b/resources/profiles/Custom/process/0.12mm Fine @MyRRF.json index 2d30168abf..99d504fda5 100644 --- a/resources/profiles/Custom/process/0.12mm Fine @MyRRF.json +++ b/resources/profiles/Custom/process/0.12mm Fine @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "Zj9uGAyf8yYuHwRQ", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.12", "bottom_shell_layers": "5", "top_shell_layers": "6" diff --git a/resources/profiles/Custom/process/0.12mm Fine @MyToolChanger.json b/resources/profiles/Custom/process/0.12mm Fine @MyToolChanger.json index 5e3e23f000..840eb680c4 100644 --- a/resources/profiles/Custom/process/0.12mm Fine @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.12mm Fine @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "RjRwftLktZM6uz3u", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.12", "bottom_shell_layers": "5", "top_shell_layers": "6", diff --git a/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json b/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json index 9036023f45..dd8ff191cb 100644 --- a/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json +++ b/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "CiHtbxYtXnT5bdRM", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "layer_height": "0.15", diff --git a/resources/profiles/Custom/process/0.15mm Optimal @MyMarlin.json b/resources/profiles/Custom/process/0.15mm Optimal @MyMarlin.json index 13236b3640..1c3dfa5239 100644 --- a/resources/profiles/Custom/process/0.15mm Optimal @MyMarlin.json +++ b/resources/profiles/Custom/process/0.15mm Optimal @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "gkXHi7QQxtxIy9V9", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "layer_height": "0.15" diff --git a/resources/profiles/Custom/process/0.15mm Optimal @MyRRF.json b/resources/profiles/Custom/process/0.15mm Optimal @MyRRF.json index dd2d25490e..9d2ba95304 100644 --- a/resources/profiles/Custom/process/0.15mm Optimal @MyRRF.json +++ b/resources/profiles/Custom/process/0.15mm Optimal @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "TcZOJuBSFK5kB1H8", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "layer_height": "0.15" diff --git a/resources/profiles/Custom/process/0.15mm Optimal @MyToolChanger.json b/resources/profiles/Custom/process/0.15mm Optimal @MyToolChanger.json index 67c34009a8..6758afab14 100644 --- a/resources/profiles/Custom/process/0.15mm Optimal @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.15mm Optimal @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "kZG2HcARq8ZFzUk9", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "layer_height": "0.15", diff --git a/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json b/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json index 1a1d9a60b1..1718a8a931 100644 --- a/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json +++ b/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "qMjBH8WRooCfhtTP", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "support_top_z_distance": "0.16", diff --git a/resources/profiles/Custom/process/0.16mm Optimal @MyToolChanger.json b/resources/profiles/Custom/process/0.16mm Optimal @MyToolChanger.json index fd035549f6..683c8d29e9 100644 --- a/resources/profiles/Custom/process/0.16mm Optimal @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.16mm Optimal @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "99y1EZwxDuKQwzv3", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "bottom_shell_layers": "4", "top_shell_layers": "5", "support_top_z_distance": "0.16", diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json b/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json index bb7c196823..34266e7168 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "UkxcnbdZ2LeRvO4x", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.2", "compatible_printers": [ "MyKlipper 0.4 nozzle", diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyMarlin.json b/resources/profiles/Custom/process/0.20mm Standard @MyMarlin.json index 9ea731097b..78b61e3610 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyMarlin.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "zZztMlYzzLA0KiTz", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.2", "bottom_shell_layers": "3", "top_shell_layers": "4" diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyRRF.json b/resources/profiles/Custom/process/0.20mm Standard @MyRRF.json index 4c17f18134..ad41f0b413 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyRRF.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "UFkBAddrcwXsuoVt", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.2", "bottom_shell_layers": "3", "top_shell_layers": "4" diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyRepetier.json b/resources/profiles/Custom/process/0.20mm Standard @MyRepetier.json index 63023f1cb5..735b628335 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyRepetier.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyRepetier.json @@ -5,7 +5,17 @@ "from": "system", "setting_id": "Ny9kvyQ0UjkVAUiY", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.2", "bottom_shell_layers": "3", "top_shell_layers": "4" -} \ No newline at end of file +} diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyToolChanger.json b/resources/profiles/Custom/process/0.20mm Standard @MyToolChanger.json index 53dc9dc6c7..9706cd10b5 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "MHpNmkShui6fTwVu", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.2", "compatible_printers": [ "MyToolChanger 0.4 nozzle", diff --git a/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json b/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json index f54829e461..80191bedea 100644 --- a/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "E5SAhAOy240BOYOB", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.2", "support_bottom_z_distance": "0.2", "layer_height": "0.24", diff --git a/resources/profiles/Custom/process/0.24mm Draft @MyMarlin.json b/resources/profiles/Custom/process/0.24mm Draft @MyMarlin.json index 2f75b3af69..c3ab4c7dcf 100644 --- a/resources/profiles/Custom/process/0.24mm Draft @MyMarlin.json +++ b/resources/profiles/Custom/process/0.24mm Draft @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "HjdvHJl5dBqwwOiq", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.24", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Custom/process/0.24mm Draft @MyRRF.json b/resources/profiles/Custom/process/0.24mm Draft @MyRRF.json index 4da6be51ee..0561313f06 100644 --- a/resources/profiles/Custom/process/0.24mm Draft @MyRRF.json +++ b/resources/profiles/Custom/process/0.24mm Draft @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "lh4F2302iVSyXP0D", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.24", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Custom/process/0.24mm Draft @MyToolChanger.json b/resources/profiles/Custom/process/0.24mm Draft @MyToolChanger.json index b16f1bcf0c..b3d7f7c91d 100644 --- a/resources/profiles/Custom/process/0.24mm Draft @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.24mm Draft @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "2V93QpRMBE9OU5Ak", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.2", "support_bottom_z_distance": "0.2", "layer_height": "0.24", diff --git a/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json index 0a9a9c3316..6c7aeb10fd 100644 --- a/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "Wxgntm1oFqaS5sSD", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.28", "initial_layer_print_height": "0.2", "compatible_printers": [ diff --git a/resources/profiles/Custom/process/0.28mm Extra Draft @MyMarlin.json b/resources/profiles/Custom/process/0.28mm Extra Draft @MyMarlin.json index dc59a3bc35..4bbb83dcd2 100644 --- a/resources/profiles/Custom/process/0.28mm Extra Draft @MyMarlin.json +++ b/resources/profiles/Custom/process/0.28mm Extra Draft @MyMarlin.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "FPRthCpiEQtZgF7W", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.28", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Custom/process/0.28mm Extra Draft @MyRRF.json b/resources/profiles/Custom/process/0.28mm Extra Draft @MyRRF.json index 09c9dba77c..f41c7a1b13 100644 --- a/resources/profiles/Custom/process/0.28mm Extra Draft @MyRRF.json +++ b/resources/profiles/Custom/process/0.28mm Extra Draft @MyRRF.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "KWkOr3YqJ2Jf3UAF", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.28", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Custom/process/0.28mm Extra Draft @MyToolChanger.json b/resources/profiles/Custom/process/0.28mm Extra Draft @MyToolChanger.json index d069bcc819..2fab506db7 100644 --- a/resources/profiles/Custom/process/0.28mm Extra Draft @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.28mm Extra Draft @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "q6Bc7ar365O7vKe3", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "layer_height": "0.28", "initial_layer_print_height": "0.2", "compatible_printers": [ diff --git a/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json index 4db0c96be0..57ac63f76b 100644 --- a/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "b3MuRrAWKYtKZM79", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.32", diff --git a/resources/profiles/Custom/process/0.32mm Extra Draft @MyToolChanger.json b/resources/profiles/Custom/process/0.32mm Extra Draft @MyToolChanger.json index 0dcd2fb762..df929ad1b7 100644 --- a/resources/profiles/Custom/process/0.32mm Extra Draft @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.32mm Extra Draft @MyToolChanger.json @@ -6,6 +6,40 @@ "from": "system", "setting_id": "7cM9iT4GyGhmfwHu", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.32", diff --git a/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json index 74bce75980..eb66511d10 100644 --- a/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "bc0WLUlEcdg9LWE5", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.40", diff --git a/resources/profiles/Custom/process/0.40mm Extra Draft @MyToolChanger.json b/resources/profiles/Custom/process/0.40mm Extra Draft @MyToolChanger.json index 4922fdb747..365fc27fd9 100644 --- a/resources/profiles/Custom/process/0.40mm Extra Draft @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.40mm Extra Draft @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "BnN85WtRYfMwpdV0", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.40", diff --git a/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json index f470958a24..f81887191a 100644 --- a/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json @@ -5,6 +5,16 @@ "from": "system", "setting_id": "ivoHEUPxZxSxGmrh", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.56", diff --git a/resources/profiles/Custom/process/0.56mm Extra Draft @MyToolChanger.json b/resources/profiles/Custom/process/0.56mm Extra Draft @MyToolChanger.json index 226610bfc2..3b380c1868 100644 --- a/resources/profiles/Custom/process/0.56mm Extra Draft @MyToolChanger.json +++ b/resources/profiles/Custom/process/0.56mm Extra Draft @MyToolChanger.json @@ -5,6 +5,40 @@ "from": "system", "setting_id": "Pky5GvEuSlaG1Lvm", "instantiation": "true", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "layer_height": "0.56", diff --git a/resources/profiles/Custom/process/fdm_process_common.json b/resources/profiles/Custom/process/fdm_process_common.json index 0d558129af..55b4a58665 100644 --- a/resources/profiles/Custom/process/fdm_process_common.json +++ b/resources/profiles/Custom/process/fdm_process_common.json @@ -3,22 +3,60 @@ "name": "fdm_process_common", "from": "system", "instantiation": "false", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_thickness": "0", - "bridge_speed": "50", + "bridge_speed": [ + "50", + "50", + "50" + ], "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [], "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "1000", - "initial_layer_acceleration": "500", - "top_surface_acceleration": "1000", - "travel_acceleration": "1000", - "inner_wall_acceleration": "1000", - "outer_wall_acceleration": "700", + "default_acceleration": [ + "1000", + "1000", + "1000" + ], + "initial_layer_acceleration": [ + "500", + "500", + "500" + ], + "top_surface_acceleration": [ + "1000", + "1000", + "1000" + ], + "travel_acceleration": [ + "1000", + "1000", + "1000" + ], + "inner_wall_acceleration": [ + "1000", + "1000", + "1000" + ], + "outer_wall_acceleration": [ + "700", + "700", + "700" + ], "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", @@ -38,11 +76,31 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", "detect_overhang_wall": "1", - "slowdown_for_curled_perimeters": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", + "slowdown_for_curled_perimeters": [ + "1", + "1", + "1" + ], + "overhang_1_4_speed": [ + "0", + "0", + "0" + ], + "overhang_2_4_speed": [ + "50", + "50", + "50" + ], + "overhang_3_4_speed": [ + "30", + "30", + "30" + ], + "overhang_4_4_speed": [ + "10", + "10", + "10" + ], "line_width": "110%", "inner_wall_line_width": "110%", "outer_wall_line_width": "100%", @@ -74,10 +132,18 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_interface_speed": "80", + "support_interface_speed": [ + "80", + "80", + "80" + ], "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", - "support_speed": "150", + "support_speed": [ + "150", + "150", + "150" + ], "support_threshold_angle": "30", "support_object_xy_distance": "0.35", "tree_support_branch_angle": "30", @@ -94,13 +160,49 @@ "bottom_shell_layers": "3", "top_shell_layers": "4", "bridge_flow": "1", - "initial_layer_speed": "45", - "initial_layer_infill_speed": "45", - "outer_wall_speed": "45", - "inner_wall_speed": "80", - "sparse_infill_speed": "150", - "internal_solid_infill_speed": "150", - "top_surface_speed": "50", - "gap_infill_speed": "30", - "travel_speed": "200" + "initial_layer_speed": [ + "45", + "45", + "45" + ], + "initial_layer_infill_speed": [ + "45", + "45", + "45" + ], + "outer_wall_speed": [ + "45", + "45", + "45" + ], + "inner_wall_speed": [ + "80", + "80", + "80" + ], + "sparse_infill_speed": [ + "150", + "150", + "150" + ], + "internal_solid_infill_speed": [ + "150", + "150", + "150" + ], + "top_surface_speed": [ + "50", + "50", + "50" + ], + "gap_infill_speed": [ + "30", + "30", + "30" + ], + "travel_speed": [ + "200", + "200", + "200" + ] } diff --git a/resources/profiles/Custom/process/fdm_process_klipper_common.json b/resources/profiles/Custom/process/fdm_process_klipper_common.json index 2977d9392a..d24268b0c6 100644 --- a/resources/profiles/Custom/process/fdm_process_klipper_common.json +++ b/resources/profiles/Custom/process/fdm_process_klipper_common.json @@ -4,20 +4,90 @@ "inherits": "fdm_process_common", "from": "system", "instantiation": "false", - "default_acceleration": "5000", - "top_surface_acceleration": "3000", - "travel_acceleration": "7000", - "inner_wall_acceleration": "5000", - "outer_wall_acceleration": "3000", - "initial_layer_acceleration": "500", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "sparse_infill_speed": "200", - "travel_speed": "350", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "default_acceleration": [ + "5000", + "5000", + "5000" + ], + "top_surface_acceleration": [ + "3000", + "3000", + "3000" + ], + "travel_acceleration": [ + "7000", + "7000", + "7000" + ], + "inner_wall_acceleration": [ + "5000", + "5000", + "5000" + ], + "outer_wall_acceleration": [ + "3000", + "3000", + "3000" + ], + "initial_layer_acceleration": [ + "500", + "500", + "500" + ], + "initial_layer_speed": [ + "50", + "50", + "50" + ], + "initial_layer_infill_speed": [ + "105", + "105", + "105" + ], + "outer_wall_speed": [ + "120", + "120", + "120" + ], + "inner_wall_speed": [ + "200", + "200", + "200" + ], + "internal_solid_infill_speed": [ + "200", + "200", + "200" + ], + "top_surface_speed": [ + "100", + "100", + "100" + ], + "gap_infill_speed": [ + "100", + "100", + "100" + ], + "sparse_infill_speed": [ + "200", + "200", + "200" + ], + "travel_speed": [ + "350", + "350", + "350" + ], "exclude_object": "1" } diff --git a/resources/profiles/Custom/process/fdm_process_marlin_common.json b/resources/profiles/Custom/process/fdm_process_marlin_common.json index 5f5c10f173..f15c13984b 100644 --- a/resources/profiles/Custom/process/fdm_process_marlin_common.json +++ b/resources/profiles/Custom/process/fdm_process_marlin_common.json @@ -4,22 +4,56 @@ "inherits": "fdm_process_common", "from": "system", "instantiation": "false", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "0.95", - "bridge_speed": "50", + "bridge_speed": [ + "50", + "50", + "50" + ], "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "1000", - "top_surface_acceleration": "1000", - "travel_acceleration": "1000", - "inner_wall_acceleration": "1000", - "outer_wall_acceleration": "1000", + "default_acceleration": [ + "1000", + "1000", + "1000" + ], + "top_surface_acceleration": [ + "1000", + "1000", + "1000" + ], + "travel_acceleration": [ + "1000", + "1000", + "1000" + ], + "inner_wall_acceleration": [ + "1000", + "1000", + "1000" + ], + "outer_wall_acceleration": [ + "1000", + "1000", + "1000" + ], "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", @@ -29,7 +63,11 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", + "initial_layer_acceleration": [ + "500", + "500", + "500" + ], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", @@ -44,10 +82,26 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", + "overhang_1_4_speed": [ + "0", + "0", + "0" + ], + "overhang_2_4_speed": [ + "50", + "50", + "50" + ], + "overhang_3_4_speed": [ + "30", + "30", + "30" + ], + "overhang_4_4_speed": [ + "10", + "10", + "10" + ], "inner_wall_line_width": "0.45", "wall_loops": "3", "print_settings_id": "", @@ -73,10 +127,18 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_interface_speed": "40", + "support_interface_speed": [ + "40", + "40", + "40" + ], "support_base_pattern": "rectilinear", "support_base_pattern_spacing": "2.5", - "support_speed": "60", + "support_speed": [ + "60", + "60", + "60" + ], "support_threshold_angle": "30", "support_object_xy_distance": "0.35", "tree_support_branch_angle": "45", @@ -86,15 +148,51 @@ "top_surface_line_width": "0.4", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "initial_layer_speed": "45", - "initial_layer_infill_speed": "60", - "outer_wall_speed": "60", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "top_surface_speed": "50", - "gap_infill_speed": "80", - "sparse_infill_speed": "80", - "travel_speed": "150", + "initial_layer_speed": [ + "45", + "45", + "45" + ], + "initial_layer_infill_speed": [ + "60", + "60", + "60" + ], + "outer_wall_speed": [ + "60", + "60", + "60" + ], + "inner_wall_speed": [ + "80", + "80", + "80" + ], + "internal_solid_infill_speed": [ + "80", + "80", + "80" + ], + "top_surface_speed": [ + "50", + "50", + "50" + ], + "gap_infill_speed": [ + "80", + "80", + "80" + ], + "sparse_infill_speed": [ + "80", + "80", + "80" + ], + "travel_speed": [ + "150", + "150", + "150" + ], "enable_prime_tower": "1", "wipe_tower_no_sparse_layers": "0", "prime_tower_width": "60", diff --git a/resources/profiles/Custom/process/fdm_process_mytoolchanger_common.json b/resources/profiles/Custom/process/fdm_process_mytoolchanger_common.json index 95b1b8b497..764a2220c6 100644 --- a/resources/profiles/Custom/process/fdm_process_mytoolchanger_common.json +++ b/resources/profiles/Custom/process/fdm_process_mytoolchanger_common.json @@ -4,21 +4,431 @@ "inherits": "fdm_process_klipper_common", "from": "system", "instantiation": "false", - "default_acceleration": "5000", - "top_surface_acceleration": "3000", - "travel_acceleration": "7000", - "inner_wall_acceleration": "5000", - "outer_wall_acceleration": "3000", - "initial_layer_acceleration": "500", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "sparse_infill_speed": "200", - "travel_speed": "350", + "print_extruder_id": [ + "1", + "1", + "1", + "2", + "2", + "2", + "3", + "3", + "3", + "4", + "4", + "4", + "5", + "5", + "5" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], + "default_acceleration": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "top_surface_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "travel_acceleration": [ + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000", + "7000" + ], + "inner_wall_acceleration": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "outer_wall_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "initial_layer_acceleration": [ + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500", + "500" + ], + "initial_layer_speed": [ + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50" + ], + "initial_layer_infill_speed": [ + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105", + "105" + ], + "outer_wall_speed": [ + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120", + "120" + ], + "inner_wall_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], + "internal_solid_infill_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], + "top_surface_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "gap_infill_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "sparse_infill_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], + "travel_speed": [ + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350", + "350" + ], + "bridge_speed": [ + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50" + ], + "slowdown_for_curled_perimeters": [ + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1", + "1" + ], + "overhang_1_4_speed": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "overhang_2_4_speed": [ + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50" + ], + "overhang_3_4_speed": [ + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30", + "30" + ], + "overhang_4_4_speed": [ + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10" + ], + "support_interface_speed": [ + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80" + ], + "support_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "exclude_object": "1", "enable_prime_tower": "1", "wipe_tower_cone_angle": "25", diff --git a/resources/profiles/Custom/process/fdm_process_repetier_common.json b/resources/profiles/Custom/process/fdm_process_repetier_common.json index 66df7ad018..daeab13e8e 100644 --- a/resources/profiles/Custom/process/fdm_process_repetier_common.json +++ b/resources/profiles/Custom/process/fdm_process_repetier_common.json @@ -4,22 +4,56 @@ "inherits": "fdm_process_common", "from": "system", "instantiation": "false", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "0.95", - "bridge_speed": "50", + "bridge_speed": [ + "50", + "50", + "50" + ], "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "1000", - "top_surface_acceleration": "1000", - "travel_acceleration": "1000", - "inner_wall_acceleration": "1000", - "outer_wall_acceleration": "1000", + "default_acceleration": [ + "1000", + "1000", + "1000" + ], + "top_surface_acceleration": [ + "1000", + "1000", + "1000" + ], + "travel_acceleration": [ + "1000", + "1000", + "1000" + ], + "inner_wall_acceleration": [ + "1000", + "1000", + "1000" + ], + "outer_wall_acceleration": [ + "1000", + "1000", + "1000" + ], "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", @@ -29,7 +63,11 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", + "initial_layer_acceleration": [ + "500", + "500", + "500" + ], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", @@ -44,10 +82,26 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", + "overhang_1_4_speed": [ + "0", + "0", + "0" + ], + "overhang_2_4_speed": [ + "50", + "50", + "50" + ], + "overhang_3_4_speed": [ + "30", + "30", + "30" + ], + "overhang_4_4_speed": [ + "10", + "10", + "10" + ], "inner_wall_line_width": "0.45", "wall_loops": "3", "print_settings_id": "", @@ -73,10 +127,18 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_interface_speed": "40", + "support_interface_speed": [ + "40", + "40", + "40" + ], "support_base_pattern": "rectilinear", "support_base_pattern_spacing": "2.5", - "support_speed": "60", + "support_speed": [ + "60", + "60", + "60" + ], "support_threshold_angle": "30", "support_object_xy_distance": "0.35", "tree_support_branch_angle": "45", @@ -86,15 +148,51 @@ "top_surface_line_width": "0.4", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "initial_layer_speed": "45", - "initial_layer_infill_speed": "60", - "outer_wall_speed": "60", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "top_surface_speed": "50", - "gap_infill_speed": "80", - "sparse_infill_speed": "80", - "travel_speed": "150", + "initial_layer_speed": [ + "45", + "45", + "45" + ], + "initial_layer_infill_speed": [ + "60", + "60", + "60" + ], + "outer_wall_speed": [ + "60", + "60", + "60" + ], + "inner_wall_speed": [ + "80", + "80", + "80" + ], + "internal_solid_infill_speed": [ + "80", + "80", + "80" + ], + "top_surface_speed": [ + "50", + "50", + "50" + ], + "gap_infill_speed": [ + "80", + "80", + "80" + ], + "sparse_infill_speed": [ + "80", + "80", + "80" + ], + "travel_speed": [ + "150", + "150", + "150" + ], "enable_prime_tower": "1", "wipe_tower_no_sparse_layers": "0", "prime_tower_width": "60", diff --git a/resources/profiles/Custom/process/fdm_process_rrf_common.json b/resources/profiles/Custom/process/fdm_process_rrf_common.json index 469ca6ecfd..a87cc59602 100644 --- a/resources/profiles/Custom/process/fdm_process_rrf_common.json +++ b/resources/profiles/Custom/process/fdm_process_rrf_common.json @@ -4,22 +4,56 @@ "inherits": "fdm_process_common", "from": "system", "instantiation": "false", + "print_extruder_id": [ + "1", + "1", + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow" + ], "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "0.95", - "bridge_speed": "50", + "bridge_speed": [ + "50", + "50", + "50" + ], "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "5000", - "top_surface_acceleration": "3000", - "travel_acceleration": "7000", - "inner_wall_acceleration": "5000", - "outer_wall_acceleration": "3000", + "default_acceleration": [ + "5000", + "5000", + "5000" + ], + "top_surface_acceleration": [ + "3000", + "3000", + "3000" + ], + "travel_acceleration": [ + "7000", + "7000", + "7000" + ], + "inner_wall_acceleration": [ + "5000", + "5000", + "5000" + ], + "outer_wall_acceleration": [ + "3000", + "3000", + "3000" + ], "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", @@ -29,7 +63,11 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", + "initial_layer_acceleration": [ + "500", + "500", + "500" + ], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", @@ -44,10 +82,26 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", + "overhang_1_4_speed": [ + "0", + "0", + "0" + ], + "overhang_2_4_speed": [ + "50", + "50", + "50" + ], + "overhang_3_4_speed": [ + "30", + "30", + "30" + ], + "overhang_4_4_speed": [ + "10", + "10", + "10" + ], "inner_wall_line_width": "0.45", "wall_loops": "3", "print_settings_id": "", @@ -73,10 +127,18 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_interface_speed": "80", + "support_interface_speed": [ + "80", + "80", + "80" + ], "support_base_pattern": "rectilinear", "support_base_pattern_spacing": "2.5", - "support_speed": "150", + "support_speed": [ + "150", + "150", + "150" + ], "support_threshold_angle": "30", "support_object_xy_distance": "0.35", "tree_support_branch_angle": "45", @@ -86,15 +148,51 @@ "top_surface_line_width": "0.4", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "sparse_infill_speed": "200", - "travel_speed": "350", + "initial_layer_speed": [ + "50", + "50", + "50" + ], + "initial_layer_infill_speed": [ + "105", + "105", + "105" + ], + "outer_wall_speed": [ + "120", + "120", + "120" + ], + "inner_wall_speed": [ + "200", + "200", + "200" + ], + "internal_solid_infill_speed": [ + "200", + "200", + "200" + ], + "top_surface_speed": [ + "100", + "100", + "100" + ], + "gap_infill_speed": [ + "100", + "100", + "100" + ], + "sparse_infill_speed": [ + "200", + "200", + "200" + ], + "travel_speed": [ + "350", + "350", + "350" + ], "enable_prime_tower": "1", "wipe_tower_no_sparse_layers": "0", "prime_tower_width": "60", diff --git a/resources/profiles/DeltaMaker.json b/resources/profiles/DeltaMaker.json index 6ef943d248..b65109ef68 100755 --- a/resources/profiles/DeltaMaker.json +++ b/resources/profiles/DeltaMaker.json @@ -1,7 +1,7 @@ { "name": "DeltaMaker", "url": "", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "DeltaMaker configurations", "machine_model_list": [ diff --git a/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json b/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json index a31ad9aec5..a6a788e47e 100755 --- a/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json +++ b/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @DeltaMaker", - "inherits": "fdm_filament_pet", "renamed_from": "DeltaMaker Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "XmKr3I3RjeI3hm6F", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json b/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json index 2e2b626feb..7c448a26f4 100755 --- a/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json +++ b/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @DeltaMaker", - "inherits": "fdm_filament_pla", "renamed_from": "DeltaMaker Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ITJo0Cig9myqk1uB", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json b/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json index edfc8a1cd2..94a62d4d78 100755 --- a/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json +++ b/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @DeltaMaker", - "inherits": "fdm_filament_tpu", "renamed_from": "DeltaMaker Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "uWHBbbhFzvWq0qUP", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Dremel.json b/resources/profiles/Dremel.json index 3d804f6a1b..a57e18fcad 100644 --- a/resources/profiles/Dremel.json +++ b/resources/profiles/Dremel.json @@ -1,6 +1,6 @@ { "name": "Dremel", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Dremel configurations", "machine_model_list": [ diff --git a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json index 2dbcc6184e..9c3d6d69af 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D20 all", - "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D20 all;Dremel Generic PLA 3D20 all", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "UggXEvCig0b6S8Vx", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json index 03704ce5e9..2a2c9dfa6b 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D40 all", - "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D40 all;Dremel Generic PLA 3D40 all", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "VUOtsWfy46cvAyBT", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json index 78f747e0f9..9b44661579 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D45 all", - "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D45 all;Dremel Generic PLA 3D45 all", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qEeBb3Pix2iDT3SD", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index e0580014a9..e85c442406 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1,6 +1,6 @@ { "name": "Elegoo", - "version": "02.04.00.11", + "version": "02.04.00.12", "force_update": "0", "description": "Elegoo configurations", "machine_model_list": [ diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA @0.2 nozzle.json index 9bfeb0529c..489de9c25e 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Elegoo PLA @0.2 nozzle", + "inherits": "Elegoo PLA @base", "from": "system", "setting_id": "g5M60iK3oBpmDv68", "instantiation": "true", - "inherits": "Elegoo PLA @base", "filament_max_volumetric_speed": [ "3.2" ], diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo ASA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo ASA @Elegoo Giga.json index fca1b001a8..186df48f9d 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo ASA @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo ASA @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo ASA @Elegoo Giga", + "renamed_from": "Elegoo ASA @EOS Giga", "inherits": "Elegoo ASA @base", "from": "system", "setting_id": "YEKtGrB8gsvKz8XQ", @@ -19,6 +20,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo ASA @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG @Elegoo Giga.json index fa02324356..eb3d9bddbe 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG @Elegoo Giga", + "renamed_from": "Elegoo PETG @EOS Giga", "inherits": "Elegoo PETG @base", "from": "system", "setting_id": "7XyTDotf1zFmCPTV", @@ -25,6 +26,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PETG @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG PRO @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG PRO @Elegoo Giga.json index bf3942c6c9..63daca52b0 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG PRO @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG PRO @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @Elegoo Giga", + "renamed_from": "Elegoo PETG PRO @EOS Giga", "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "cO87yMETWbUTIweN", @@ -13,6 +14,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PETG PRO @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG Translucent @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG Translucent @Elegoo Giga.json index 89b17d0d8c..5ecda636ba 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG Translucent @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG Translucent @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @Elegoo Giga", + "renamed_from": "Elegoo PETG Translucent @EOS Giga", "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "fkE2LCMu63t1NQtI", @@ -25,6 +26,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PETG Translucent @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-CF @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-CF @Elegoo Giga.json index 633fee4d01..38129125b9 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-CF @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-CF @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @Elegoo Giga", + "renamed_from": "Elegoo PETG-CF @EOS Giga", "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "uGF6puqnX1jW2pmn", @@ -40,6 +41,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PETG-CF @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-GF @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-GF @Elegoo Giga.json index 085eba8e80..dce4172270 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-GF @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PETG-GF @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @Elegoo Giga", + "renamed_from": "Elegoo PETG-GF @EOS Giga", "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "S4ZpKZDyr5g5HMPi", @@ -40,6 +41,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PETG-GF @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA @Elegoo Giga.json index 32d6f6a1eb..40a421724c 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA @Elegoo Giga", + "renamed_from": "Elegoo PLA @EOS Giga", "inherits": "Elegoo PLA @base", "from": "system", "setting_id": "DzHDGa5SJa8wdZkD", @@ -13,6 +14,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Basic @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Basic @Elegoo Giga.json index 345eb9b131..0cc99c36ef 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Basic @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Basic @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @Elegoo Giga", + "renamed_from": "Elegoo PLA Basic @EOS Giga", "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "vdtyGUjloveBjsGV", @@ -28,6 +29,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Basic @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Galaxy @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Galaxy @Elegoo Giga.json index 4c6df1a2ac..41da71fe96 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Galaxy @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Galaxy @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @Elegoo Giga", + "renamed_from": "Elegoo PLA Galaxy @EOS Giga", "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "Nq1YaFeJ6Osr7OZ9", @@ -31,6 +32,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Galaxy @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Marble @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Marble @Elegoo Giga.json index a76087fb41..e4eaa97f9b 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Marble @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Marble @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @Elegoo Giga", + "renamed_from": "Elegoo PLA Marble @EOS Giga", "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "6mfjc7t9ntuG1ZKW", @@ -31,6 +32,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Marble @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Matte @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Matte @Elegoo Giga.json index ebc4a86a33..2699fa1860 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Matte @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Matte @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @Elegoo Giga", + "renamed_from": "Elegoo PLA Matte @EOS Giga", "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "mHbvYB78eds96SH8", @@ -37,6 +38,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Matte @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Sparkle @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Sparkle @Elegoo Giga.json index 68ad38e31a..e744828b49 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Sparkle @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Sparkle @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @Elegoo Giga", + "renamed_from": "Elegoo PLA Sparkle @EOS Giga", "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "pgsOuYMxtcm3Fkar", @@ -31,6 +32,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Sparkle @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Wood @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Wood @Elegoo Giga.json index 2d3118d9f9..511b3a538a 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Wood @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo PLA Wood @Elegoo Giga.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @Elegoo Giga", + "renamed_from": "Elegoo PLA Wood @EOS Giga", "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "BI2euv7xwM9F2hKC", @@ -31,6 +32,5 @@ "Elegoo OrangeStorm Giga 0.6 nozzle", "Elegoo OrangeStorm Giga 0.8 nozzle", "Elegoo OrangeStorm Giga 1.0 nozzle" - ], - "renamed_from": "Elegoo PLA Wood @EOS Giga" + ] } diff --git a/resources/profiles/Elegoo/filament/Generic/Generic ABS @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic ABS @Elegoo.json index ff56f113f1..bf95116cca 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic ABS @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic ABS @Elegoo.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "RWcQPhlCtjoh9xec", "name": "Generic ABS @Elegoo", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS @base", + "from": "system", + "setting_id": "RWcQPhlCtjoh9xec", + "instantiation": "true", "cool_plate_temp": [ "100" ], diff --git a/resources/profiles/Elegoo/filament/Generic/Generic ASA @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic ASA @Elegoo.json index eed4e746d9..ff7a1c9d00 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic ASA @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic ASA @Elegoo.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "U5sKORLsVPcldRY9", "name": "Generic ASA @Elegoo", - "from": "system", - "instantiation": "true", "inherits": "Generic ASA @base", + "from": "system", + "setting_id": "U5sKORLsVPcldRY9", + "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PETG @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PETG @Elegoo.json index 005d5b305c..d8e67cda60 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PETG @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PETG @Elegoo.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "MJMg6nee4l28n2mK", "name": "Generic PETG @Elegoo", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG @base", + "from": "system", + "setting_id": "MJMg6nee4l28n2mK", + "instantiation": "true", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json index f122066617..6b5a610016 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json @@ -1,12 +1,12 @@ { "type": "filament", - "setting_id": "pKzSR8XeyyUDbrNW", "name": "Generic PETG PRO @Elegoo", "renamed_from": "Elegoo Generic PETG PRO", + "inherits": "Generic PETG @base", "from": "system", + "setting_id": "pKzSR8XeyyUDbrNW", "filament_id": "OFllmFhT", "instantiation": "true", - "inherits": "Generic PETG @base", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PLA @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PLA @Elegoo.json index d70a73e10e..263ba5b3e4 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PLA @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PLA @Elegoo.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "PaFKjG9jocZSHl76", "name": "Generic PLA @Elegoo", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA @base", + "from": "system", + "setting_id": "PaFKjG9jocZSHl76", + "instantiation": "true", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json index 33561c23bc..3519ae8c4d 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json @@ -1,11 +1,11 @@ { "type": "filament", - "setting_id": "dH2Yf92iqsOj5XYo", "name": "Generic PLA Matte @Elegoo", + "inherits": "Generic PLA @base", "from": "system", + "setting_id": "dH2Yf92iqsOj5XYo", "filament_id": "OFmY0l6t", "instantiation": "true", - "inherits": "Generic PLA @base", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 0.4 nozzle.json index 09536322dd..2733de7433 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "zECkpVCtequEr3jC", "name": "Elegoo Neptune 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Elegoo Neptune 2 0.4 nozzle", + "from": "system", + "setting_id": "zECkpVCtequEr3jC", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2 0.4 nozzle.json index 9f2c728356..aca22ef378 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "WButFYamVx0MBjUr", "name": "Elegoo Neptune 2 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_elegoo_common", + "from": "system", + "setting_id": "WButFYamVx0MBjUr", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 2", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D 0.4 nozzle.json index ae78964a9a..8776a9d224 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "9KnJva7m7E5M1quB", "name": "Elegoo Neptune 2D 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Elegoo Neptune 2 0.4 nozzle", + "from": "system", + "setting_id": "9KnJva7m7E5M1quB", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 2D", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", @@ -29,58 +29,86 @@ "printable_height": "250", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_travel": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "70", + "70", "70", "70" ], "machine_max_speed_x": [ + "300", + "300", "300", "300" ], "machine_max_speed_y": [ + "300", + "300", "300", "300" ], "machine_max_speed_z": [ + "20", + "20", "20", "20" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "8", + "8", "8", "8" ], "machine_max_jerk_y": [ + "8", + "8", "8", "8" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S 0.4 nozzle.json index e6ee656aad..b8e276a9dd 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "a8iTteroepkgXrLV", "name": "Elegoo Neptune 2S 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_elegoo_common", + "from": "system", + "setting_id": "a8iTteroepkgXrLV", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 2S", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3 0.4 nozzle.json index 8766784dc6..af79ce92db 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "rdKmVhTTrup3yqgA", "name": "Elegoo Neptune 3 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Elegoo Neptune 2 0.4 nozzle", + "from": "system", + "setting_id": "rdKmVhTTrup3yqgA", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 3", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X 0.4 nozzle.json index 6596abf85a..19eaa4a699 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "krz8Xh3MatGnm8pm", "name": "Elegoo Neptune X 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_elegoo_common", + "from": "system", + "setting_id": "krz8Xh3MatGnm8pm", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune X", "default_print_profile": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max 0.4 nozzle.json index 9aebe16dd2..5e4dc6fe1d 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "8CM5vaCDh096ZzUs", "name": "Elegoo Neptune 3 Max 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Elegoo Neptune 3 Pro 0.4 nozzle", + "from": "system", + "setting_id": "8CM5vaCDh096ZzUs", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 3 Max", "default_print_profile": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus 0.4 nozzle.json index c53f7a7d7a..51ad7c820b 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "FylvH6NMzPbR9Bz6", "name": "Elegoo Neptune 3 Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Elegoo Neptune 3 Pro 0.4 nozzle", + "from": "system", + "setting_id": "FylvH6NMzPbR9Bz6", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 3 Plus", "default_print_profile": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro 0.4 nozzle.json index 82798b0285..b246cacab0 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "9vUFjjVwWAggcbwk", "name": "Elegoo Neptune 3 Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_elegoo_common", + "from": "system", + "setting_id": "9vUFjjVwWAggcbwk", + "instantiation": "true", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 3 Pro", "default_print_profile": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.2 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.2 nozzle.json index 32ec717163..2c01584e91 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 0.2 nozzle", + "renamed_from": "Elegoo Neptune 4 (0.2 nozzle)", "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "YGH30n1CBw3of81j", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.06" - ], - "renamed_from": "Elegoo Neptune 4 (0.2 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.4 nozzle.json index fb3ca2d389..407344c774 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "machine", "name": "Elegoo Neptune 4 0.4 nozzle", + "renamed_from": "Elegoo Neptune 4 (0.4 nozzle)", + "inherits": "fdm_elegoo_3dp_001_common", "from": "system", "setting_id": "69QdWuRQwAZk9rFu", "instantiation": "true", - "inherits": "fdm_elegoo_3dp_001_common", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 4", "default_print_profile": "0.20mm Standard @Elegoo N4 0.4 nozzle", @@ -114,6 +115,5 @@ "160x160/COLPIC/#30394F", "160x160/PNG" ], - "thumbnails_format": "COLPIC", - "renamed_from": "Elegoo Neptune 4 (0.4 nozzle)" + "thumbnails_format": "COLPIC" } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.6 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.6 nozzle.json index 6195ecf232..68763e7e16 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 0.6 nozzle", + "renamed_from": "Elegoo Neptune 4 (0.6 nozzle)", "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "hAlEcYQJUiRdXvP3", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.12" - ], - "renamed_from": "Elegoo Neptune 4 (0.6 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.8 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.8 nozzle.json index 52483240b3..f3a97531dc 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 0.8 nozzle", + "renamed_from": "Elegoo Neptune 4 (0.8 nozzle)", "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "2lAqJ4y4QPkkG3Eq", @@ -31,6 +32,5 @@ ], "retract_length_toolchange": [ "3" - ], - "renamed_from": "Elegoo Neptune 4 (0.8 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.2 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.2 nozzle.json index 5b863d5773..f3fbfacfda 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Max 0.2 nozzle", + "renamed_from": "Elegoo Neptune 4 Max (0.2 nozzle)", "inherits": "Elegoo Neptune 4 Max 0.4 nozzle", "from": "system", "setting_id": "cnSthrwdZaeijtbD", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.06" - ], - "renamed_from": "Elegoo Neptune 4 Max (0.2 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.4 nozzle.json index 08c9690cda..3779e74c0d 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "machine", "name": "Elegoo Neptune 4 Max 0.4 nozzle", + "renamed_from": "Elegoo Neptune 4 Max (0.4 nozzle)", + "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "Ie1QF4p1mjA7QqZf", "instantiation": "true", - "inherits": "Elegoo Neptune 4 0.4 nozzle", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 4 Max", "default_print_profile": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", @@ -80,6 +81,5 @@ "nozzle_volume": "110", "default_filament_profile": [ "Elegoo PLA @EN4 Series" - ], - "renamed_from": "Elegoo Neptune 4 Max (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.6 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.6 nozzle.json index 0b117150b1..04562e965a 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Max 0.6 nozzle", + "renamed_from": "Elegoo Neptune 4 Max (0.6 nozzle)", "inherits": "Elegoo Neptune 4 Max 0.4 nozzle", "from": "system", "setting_id": "DXxpsdZ4r73cfNT7", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.12" - ], - "renamed_from": "Elegoo Neptune 4 Max (0.6 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.8 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.8 nozzle.json index ca4c4dc092..9f9aea1263 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Max 0.8 nozzle", + "renamed_from": "Elegoo Neptune 4 Max (0.8 nozzle)", "inherits": "Elegoo Neptune 4 Max 0.4 nozzle", "from": "system", "setting_id": "licXMWyXGDavpuvu", @@ -31,6 +32,5 @@ ], "retract_length_toolchange": [ "3" - ], - "renamed_from": "Elegoo Neptune 4 Max (0.8 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.2 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.2 nozzle.json index e0c66e5166..1040c95656 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Plus 0.2 nozzle", + "renamed_from": "Elegoo Neptune 4 Plus (0.2 nozzle)", "inherits": "Elegoo Neptune 4 Plus 0.4 nozzle", "from": "system", "setting_id": "i5vcoYRF6cqkYBg9", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.06" - ], - "renamed_from": "Elegoo Neptune 4 Plus (0.2 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.4 nozzle.json index d6686b8bba..84f8568da2 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "machine", "name": "Elegoo Neptune 4 Plus 0.4 nozzle", + "renamed_from": "Elegoo Neptune 4 Plus (0.4 nozzle)", + "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "Rc54LjtIhvBWRS2Y", "instantiation": "true", - "inherits": "Elegoo Neptune 4 0.4 nozzle", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 4 Plus", "default_print_profile": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", @@ -80,6 +81,5 @@ "nozzle_volume": "110", "default_filament_profile": [ "Elegoo PLA @EN4 Series" - ], - "renamed_from": "Elegoo Neptune 4 Plus (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.6 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.6 nozzle.json index d038519e2e..1a1c90eaea 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Plus 0.6 nozzle", + "renamed_from": "Elegoo Neptune 4 Plus (0.6 nozzle)", "inherits": "Elegoo Neptune 4 Plus 0.4 nozzle", "from": "system", "setting_id": "nCRrAqumiiZpu5Re", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.12" - ], - "renamed_from": "Elegoo Neptune 4 Plus (0.6 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.8 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.8 nozzle.json index e4cbdaf790..21bceaceec 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Plus 0.8 nozzle", + "renamed_from": "Elegoo Neptune 4 Plus (0.8 nozzle)", "inherits": "Elegoo Neptune 4 Plus 0.4 nozzle", "from": "system", "setting_id": "CM0ZVy6UJRObNbMV", @@ -31,6 +32,5 @@ ], "retract_length_toolchange": [ "3" - ], - "renamed_from": "Elegoo Neptune 4 Plus (0.8 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.2 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.2 nozzle.json index ff7bd8fdf9..bc9b797d10 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Pro 0.2 nozzle", + "renamed_from": "Elegoo Neptune 4 Pro (0.2 nozzle)", "inherits": "Elegoo Neptune 4 Pro 0.4 nozzle", "from": "system", "setting_id": "tjxZec78rbpYkEM2", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.06" - ], - "renamed_from": "Elegoo Neptune 4 Pro (0.2 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.4 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.4 nozzle.json index 97b3ad8fea..37b92b682e 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "machine", "name": "Elegoo Neptune 4 Pro 0.4 nozzle", + "renamed_from": "Elegoo Neptune 4 Pro (0.4 nozzle)", + "inherits": "Elegoo Neptune 4 0.4 nozzle", "from": "system", "setting_id": "H1wMUu4EMaiQzxeD", "instantiation": "true", - "inherits": "Elegoo Neptune 4 0.4 nozzle", "host_type": "elegoolink", "printer_model": "Elegoo Neptune 4 Pro", "default_print_profile": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", @@ -35,6 +36,5 @@ "before_layer_change_gcode": ";[layer_z]\nG92 E0\n{if (first_layer_print_min[0]) > 57.5 && (first_layer_print_min[1]) > 57.5 &&(first_layer_print_max[0]) < 177.5 && (first_layer_print_max[1]) < 177.5 && layer_num < 4 && bed_temperature_initial_layer_single < 71}\nM141 S0\n{endif}", "default_filament_profile": [ "Elegoo PLA @EN4 Series" - ], - "renamed_from": "Elegoo Neptune 4 Pro (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.6 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.6 nozzle.json index 940da1c6a3..1572bcc985 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Pro 0.6 nozzle", + "renamed_from": "Elegoo Neptune 4 Pro (0.6 nozzle)", "inherits": "Elegoo Neptune 4 Pro 0.4 nozzle", "from": "system", "setting_id": "f9xvw4oHKtdZq7oq", @@ -28,6 +29,5 @@ ], "min_layer_height": [ "0.12" - ], - "renamed_from": "Elegoo Neptune 4 Pro (0.6 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.8 nozzle.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.8 nozzle.json index cdeebf75c3..ea04471ccc 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "machine", "name": "Elegoo Neptune 4 Pro 0.8 nozzle", + "renamed_from": "Elegoo Neptune 4 Pro (0.8 nozzle)", "inherits": "Elegoo Neptune 4 Pro 0.4 nozzle", "from": "system", "setting_id": "nd5TLZa3xnDu1s4W", @@ -31,6 +32,5 @@ ], "retract_length_toolchange": [ "3" - ], - "renamed_from": "Elegoo Neptune 4 Pro (0.8 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/process/EC/0.08mm Optimal @Elegoo C 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC/0.08mm Optimal @Elegoo C 0.2 nozzle.json index 2312d6f0e6..4deed44f41 100644 --- a/resources/profiles/Elegoo/process/EC/0.08mm Optimal @Elegoo C 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.08mm Optimal @Elegoo C 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "elefant_foot_compensation": "0.05", - "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", - "layer_height": "0.08", "name": "0.08mm Optimal @Elegoo C 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", "from": "system", "setting_id": "YPAU0R4VfHdwXGMK", - "instantiation": "true" + "instantiation": "true", + "elefant_foot_compensation": "0.05", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EC/0.12mm Draft @Elegoo C 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC/0.12mm Draft @Elegoo C 0.2 nozzle.json index 8a775fd9d6..2c04217e64 100644 --- a/resources/profiles/Elegoo/process/EC/0.12mm Draft @Elegoo C 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.12mm Draft @Elegoo C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", - "layer_height": "0.12", "name": "0.12mm Draft @Elegoo C 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", "from": "system", "setting_id": "2syIUL3VOd1cnbjD", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EC/0.12mm Fine @Elegoo C 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC/0.12mm Fine @Elegoo C 0.4 nozzle.json index a94c0e7b2e..f922a8890d 100644 --- a/resources/profiles/Elegoo/process/EC/0.12mm Fine @Elegoo C 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.12mm Fine @Elegoo C 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", - "layer_height": "0.12", "name": "0.12mm Fine @Elegoo C 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "from": "system", - "wall_loops": "3", "setting_id": "0S47zshoJbgOUinj", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EC/0.14mm Extra Draft @Elegoo C 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC/0.14mm Extra Draft @Elegoo C 0.2 nozzle.json index d676fb31b1..5eb42ca072 100644 --- a/resources/profiles/Elegoo/process/EC/0.14mm Extra Draft @Elegoo C 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.14mm Extra Draft @Elegoo C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", - "layer_height": "0.14", "name": "0.14mm Extra Draft @Elegoo C 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C 0.2 nozzle", "from": "system", "setting_id": "6ibckorXgT6NdqHu", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.14" } diff --git a/resources/profiles/Elegoo/process/EC/0.16mm Extra Fine @Elegoo C 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC/0.16mm Extra Fine @Elegoo C 0.8 nozzle.json index 4cc9f531bb..aedfb88750 100644 --- a/resources/profiles/Elegoo/process/EC/0.16mm Extra Fine @Elegoo C 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.16mm Extra Fine @Elegoo C 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.16", "name": "0.16mm Extra Fine @Elegoo C 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", "from": "system", "setting_id": "93O7HpujQ35rwBWc", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EC/0.16mm Optimal @Elegoo C 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC/0.16mm Optimal @Elegoo C 0.4 nozzle.json index 4bce55dde7..cf7751dfb9 100644 --- a/resources/profiles/Elegoo/process/EC/0.16mm Optimal @Elegoo C 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.16mm Optimal @Elegoo C 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", - "layer_height": "0.16", "name": "0.16mm Optimal @Elegoo C 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "from": "system", "setting_id": "KW2VknXy8J5A7ot5", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EC/0.18mm Fine @Elegoo C 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC/0.18mm Fine @Elegoo C 0.6 nozzle.json index 212ac989de..5d8f5a90b9 100644 --- a/resources/profiles/Elegoo/process/EC/0.18mm Fine @Elegoo C 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.18mm Fine @Elegoo C 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", - "layer_height": "0.18", "name": "0.18mm Fine @Elegoo C 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", "from": "system", "setting_id": "Z2Qn4avdLVCcBmcZ", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.18" } diff --git a/resources/profiles/Elegoo/process/EC/0.20mm Strength @Elegoo C 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC/0.20mm Strength @Elegoo C 0.4 nozzle.json index 33702fa81d..81cf56d8c0 100644 --- a/resources/profiles/Elegoo/process/EC/0.20mm Strength @Elegoo C 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.20mm Strength @Elegoo C 0.4 nozzle.json @@ -1,8 +1,10 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "name": "0.20mm Strength @Elegoo C 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "from": "system", + "setting_id": "ICxi69TCESAQTBVb", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "bottom_shell_layers": "5", @@ -10,7 +12,5 @@ "print_flow_ratio": "0.95", "sparse_infill_density": "20%", "top_shell_layers": "6", - "wall_loops": "6", - "setting_id": "ICxi69TCESAQTBVb", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EC/0.24mm Draft @Elegoo C 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC/0.24mm Draft @Elegoo C 0.4 nozzle.json index fa0edcba37..395d036d1e 100644 --- a/resources/profiles/Elegoo/process/EC/0.24mm Draft @Elegoo C 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.24mm Draft @Elegoo C 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", - "layer_height": "0.24", "name": "0.24mm Draft @Elegoo C 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "from": "system", "setting_id": "eoyZK9tkjdL1ATi9", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC/0.24mm Fine @Elegoo C 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC/0.24mm Fine @Elegoo C 0.8 nozzle.json index 16dde5137e..f5b96e47ca 100644 --- a/resources/profiles/Elegoo/process/EC/0.24mm Fine @Elegoo C 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.24mm Fine @Elegoo C 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.24", "name": "0.24mm Fine @Elegoo C 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", "from": "system", "setting_id": "HyulASCV51SI9Dgo", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC/0.24mm Optimal @Elegoo C 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC/0.24mm Optimal @Elegoo C 0.6 nozzle.json index 3e12c4cc8f..11af13cf25 100644 --- a/resources/profiles/Elegoo/process/EC/0.24mm Optimal @Elegoo C 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.24mm Optimal @Elegoo C 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", - "layer_height": "0.24", "name": "0.24mm Optimal @Elegoo C 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", "from": "system", "setting_id": "2H4qamD9XBTs46M7", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC/0.28mm Extra Draft @Elegoo C 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC/0.28mm Extra Draft @Elegoo C 0.4 nozzle.json index a996b51d67..a9b43740a2 100644 --- a/resources/profiles/Elegoo/process/EC/0.28mm Extra Draft @Elegoo C 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.28mm Extra Draft @Elegoo C 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", - "layer_height": "0.28", "name": "0.28mm Extra Draft @Elegoo C 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C 0.4 nozzle", "from": "system", "setting_id": "R2evn20zXKqcB4Ro", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EC/0.30mm Strength @Elegoo C 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC/0.30mm Strength @Elegoo C 0.6 nozzle.json index d0d20b4fc7..8b082b398a 100644 --- a/resources/profiles/Elegoo/process/EC/0.30mm Strength @Elegoo C 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.30mm Strength @Elegoo C 0.6 nozzle.json @@ -1,15 +1,15 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", - "inner_wall_speed": "120", "name": "0.30mm Strength @Elegoo C 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", "from": "system", + "setting_id": "GtT1qn9vSWDdqBmm", + "instantiation": "true", + "inner_wall_speed": "120", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "outer_wall_speed": "80", "sparse_infill_density": "15%", "top_surface_speed": "120", - "wall_loops": "4", - "setting_id": "GtT1qn9vSWDdqBmm", - "instantiation": "true" + "wall_loops": "4" } diff --git a/resources/profiles/Elegoo/process/EC/0.32mm Optimal @Elegoo C 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC/0.32mm Optimal @Elegoo C 0.8 nozzle.json index c98b6810e2..7c7badf6de 100644 --- a/resources/profiles/Elegoo/process/EC/0.32mm Optimal @Elegoo C 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.32mm Optimal @Elegoo C 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", - "layer_height": "0.32", "name": "0.32mm Optimal @Elegoo C 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", "from": "system", "setting_id": "HDjwnNiVaWHvhyTX", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EC/0.36mm Draft @Elegoo C 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC/0.36mm Draft @Elegoo C 0.6 nozzle.json index 255e8ee255..24a73ec080 100644 --- a/resources/profiles/Elegoo/process/EC/0.36mm Draft @Elegoo C 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.36mm Draft @Elegoo C 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", - "layer_height": "0.36", "name": "0.36mm Draft @Elegoo C 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", "from": "system", "setting_id": "AviieBSwRir1KzZr", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EC/0.42mm Extra Draft @Elegoo C 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC/0.42mm Extra Draft @Elegoo C 0.6 nozzle.json index c146f09d58..24e74d5c84 100644 --- a/resources/profiles/Elegoo/process/EC/0.42mm Extra Draft @Elegoo C 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.42mm Extra Draft @Elegoo C 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", - "layer_height": "0.42", "name": "0.42mm Extra Draft @Elegoo C 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C 0.6 nozzle", "from": "system", "setting_id": "ex5zv2heDmy6ZcbP", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EC/0.48mm Draft @Elegoo C 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC/0.48mm Draft @Elegoo C 0.8 nozzle.json index 8aea27b6dd..ba4e097193 100644 --- a/resources/profiles/Elegoo/process/EC/0.48mm Draft @Elegoo C 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC/0.48mm Draft @Elegoo C 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", - "layer_height": "0.48", "name": "0.48mm Draft @Elegoo C 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C 0.8 nozzle", "from": "system", "setting_id": "ZFRRBIC9Z4OzSW7b", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EC2/0.08mm Optimal @Elegoo C2 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.08mm Optimal @Elegoo C2 0.2 nozzle.json index fb31e5b085..2695aa82b0 100644 --- a/resources/profiles/Elegoo/process/EC2/0.08mm Optimal @Elegoo C2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.08mm Optimal @Elegoo C2 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "elefant_foot_compensation": "0.05", - "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", - "layer_height": "0.08", "name": "0.08mm Optimal @Elegoo C2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", + "from": "system", "setting_id": "w51mhOmSGgIFKlYV", - "instantiation": "true" + "instantiation": "true", + "elefant_foot_compensation": "0.05", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EC2/0.12mm Draft @Elegoo C2 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.12mm Draft @Elegoo C2 0.2 nozzle.json index 2591f133fa..433b665c69 100644 --- a/resources/profiles/Elegoo/process/EC2/0.12mm Draft @Elegoo C2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.12mm Draft @Elegoo C2 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", - "layer_height": "0.12", "name": "0.12mm Draft @Elegoo C2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", + "from": "system", "setting_id": "MwbMs6dE4PKJjWEv", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EC2/0.12mm Fine @Elegoo C2 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.12mm Fine @Elegoo C2 0.4 nozzle.json index 1e38bdedef..03e6cda866 100644 --- a/resources/profiles/Elegoo/process/EC2/0.12mm Fine @Elegoo C2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.12mm Fine @Elegoo C2 0.4 nozzle.json @@ -1,13 +1,13 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", - "layer_height": "0.12", "name": "0.12mm Fine @Elegoo C2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", + "from": "system", + "setting_id": "NbPHZPuFyAdAwYxw", + "instantiation": "true", + "layer_height": "0.12", "wall_loops": "3", "support_bottom_z_distance": "0.2", "support_top_z_distance": "0.2", - "top_solid_infill_flow_ratio": "1.09", - "setting_id": "NbPHZPuFyAdAwYxw", - "instantiation": "true" + "top_solid_infill_flow_ratio": "1.09" } diff --git a/resources/profiles/Elegoo/process/EC2/0.14mm Extra Draft @Elegoo C2 0.2 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.14mm Extra Draft @Elegoo C2 0.2 nozzle.json index 578cc189a1..41468b71bb 100644 --- a/resources/profiles/Elegoo/process/EC2/0.14mm Extra Draft @Elegoo C2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.14mm Extra Draft @Elegoo C2 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", - "layer_height": "0.14", "name": "0.14mm Extra Draft @Elegoo C2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo C2 0.2 nozzle", + "from": "system", "setting_id": "WZYQH8ejJLFr3JKT", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.14" } diff --git a/resources/profiles/Elegoo/process/EC2/0.16mm Extra Fine @Elegoo C2 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.16mm Extra Fine @Elegoo C2 0.8 nozzle.json index ee21a677ad..aaeae89b95 100644 --- a/resources/profiles/Elegoo/process/EC2/0.16mm Extra Fine @Elegoo C2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.16mm Extra Fine @Elegoo C2 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.16", "name": "0.16mm Extra Fine @Elegoo C2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", + "from": "system", "setting_id": "8PjDabUQtqZkOYxb", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EC2/0.16mm Optimal @Elegoo C2 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.16mm Optimal @Elegoo C2 0.4 nozzle.json index cbf804ad9c..568d7ed0c2 100644 --- a/resources/profiles/Elegoo/process/EC2/0.16mm Optimal @Elegoo C2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.16mm Optimal @Elegoo C2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", - "layer_height": "0.16", "name": "0.16mm Optimal @Elegoo C2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", + "from": "system", "setting_id": "cyxRTNBvYul3eWPq", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EC2/0.18mm Fine @Elegoo C2 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.18mm Fine @Elegoo C2 0.6 nozzle.json index 607c77fc1a..f27edc3b97 100644 --- a/resources/profiles/Elegoo/process/EC2/0.18mm Fine @Elegoo C2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.18mm Fine @Elegoo C2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", - "layer_height": "0.18", "name": "0.18mm Fine @Elegoo C2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", + "from": "system", "setting_id": "CpTAuCMAczdOUFQv", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.18" } diff --git a/resources/profiles/Elegoo/process/EC2/0.20mm Strength @Elegoo C2 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.20mm Strength @Elegoo C2 0.4 nozzle.json index 8a87b379c7..3f5375d255 100644 --- a/resources/profiles/Elegoo/process/EC2/0.20mm Strength @Elegoo C2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.20mm Strength @Elegoo C2 0.4 nozzle.json @@ -1,8 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", "name": "0.20mm Strength @Elegoo C2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", + "from": "system", + "setting_id": "qE1gwHDiHsBUar05", + "instantiation": "true", "wall_sequence": "inner wall/outer wall", "reduce_crossing_wall": "0", "bottom_shell_layers": "5", @@ -11,7 +13,5 @@ "sparse_infill_density": "20%", "top_shell_layers": "6", "wall_loops": "5", - "top_solid_infill_flow_ratio": "1.09", - "setting_id": "qE1gwHDiHsBUar05", - "instantiation": "true" + "top_solid_infill_flow_ratio": "1.09" } diff --git a/resources/profiles/Elegoo/process/EC2/0.24mm Draft @Elegoo C2 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.24mm Draft @Elegoo C2 0.4 nozzle.json index 3477713edc..046e6bf7b4 100644 --- a/resources/profiles/Elegoo/process/EC2/0.24mm Draft @Elegoo C2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.24mm Draft @Elegoo C2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", - "layer_height": "0.24", "name": "0.24mm Draft @Elegoo C2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", + "from": "system", "setting_id": "m8IwC70UUDsvEgDx", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC2/0.24mm Fine @Elegoo C2 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.24mm Fine @Elegoo C2 0.8 nozzle.json index 8a3d3f1baa..af303b49d3 100644 --- a/resources/profiles/Elegoo/process/EC2/0.24mm Fine @Elegoo C2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.24mm Fine @Elegoo C2 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.24", "name": "0.24mm Fine @Elegoo C2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", + "from": "system", "setting_id": "aGRzp98JewtyCnJ5", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC2/0.24mm Optimal @Elegoo C2 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.24mm Optimal @Elegoo C2 0.6 nozzle.json index f8a86f303d..844f875909 100644 --- a/resources/profiles/Elegoo/process/EC2/0.24mm Optimal @Elegoo C2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.24mm Optimal @Elegoo C2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", - "layer_height": "0.24", "name": "0.24mm Optimal @Elegoo C2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", + "from": "system", "setting_id": "mg6YKeDhdAmVUnCp", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EC2/0.28mm Extra Draft @Elegoo C2 0.4 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.28mm Extra Draft @Elegoo C2 0.4 nozzle.json index d763b38514..325b617538 100644 --- a/resources/profiles/Elegoo/process/EC2/0.28mm Extra Draft @Elegoo C2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.28mm Extra Draft @Elegoo C2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", - "layer_height": "0.28", "name": "0.28mm Extra Draft @Elegoo C2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo C2 0.4 nozzle", + "from": "system", "setting_id": "zLhSKg0WGU0C5hfV", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EC2/0.30mm Strength @Elegoo C2 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.30mm Strength @Elegoo C2 0.6 nozzle.json index 52ff71723c..d62a28c431 100644 --- a/resources/profiles/Elegoo/process/EC2/0.30mm Strength @Elegoo C2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.30mm Strength @Elegoo C2 0.6 nozzle.json @@ -1,15 +1,15 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", - "inner_wall_speed": "120", "name": "0.30mm Strength @Elegoo C2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", + "from": "system", + "setting_id": "6Pdk7vUo7sxZ1H3r", + "instantiation": "true", + "inner_wall_speed": "120", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "outer_wall_speed": "80", "sparse_infill_density": "15%", "top_surface_speed": "120", - "wall_loops": "4", - "setting_id": "6Pdk7vUo7sxZ1H3r", - "instantiation": "true" + "wall_loops": "4" } diff --git a/resources/profiles/Elegoo/process/EC2/0.32mm Optimal @Elegoo C2 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.32mm Optimal @Elegoo C2 0.8 nozzle.json index 46caf9ca4c..f4f0a3152c 100644 --- a/resources/profiles/Elegoo/process/EC2/0.32mm Optimal @Elegoo C2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.32mm Optimal @Elegoo C2 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", - "layer_height": "0.32", "name": "0.32mm Optimal @Elegoo C2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", + "from": "system", "setting_id": "CctfduTuGLmoXTaG", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EC2/0.36mm Draft @Elegoo C2 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.36mm Draft @Elegoo C2 0.6 nozzle.json index a484461350..e5889acabd 100644 --- a/resources/profiles/Elegoo/process/EC2/0.36mm Draft @Elegoo C2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.36mm Draft @Elegoo C2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", - "layer_height": "0.36", "name": "0.36mm Draft @Elegoo C2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", + "from": "system", "setting_id": "MEasFZeORQm7BzsT", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EC2/0.42mm Extra Draft @Elegoo C2 0.6 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.42mm Extra Draft @Elegoo C2 0.6 nozzle.json index 7ab59fecd2..4499644811 100644 --- a/resources/profiles/Elegoo/process/EC2/0.42mm Extra Draft @Elegoo C2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.42mm Extra Draft @Elegoo C2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", - "layer_height": "0.42", "name": "0.42mm Extra Draft @Elegoo C2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo C2 0.6 nozzle", + "from": "system", "setting_id": "TbMqvWBwE7Hf6VdK", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EC2/0.48mm Draft @Elegoo C2 0.8 nozzle.json b/resources/profiles/Elegoo/process/EC2/0.48mm Draft @Elegoo C2 0.8 nozzle.json index 17e2904446..08a962901f 100644 --- a/resources/profiles/Elegoo/process/EC2/0.48mm Draft @Elegoo C2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EC2/0.48mm Draft @Elegoo C2 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", - "layer_height": "0.48", "name": "0.48mm Draft @Elegoo C2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo C2 0.8 nozzle", + "from": "system", "setting_id": "8BBCLnwOPdqLlIIo", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/ECC/0.08mm Optimal @Elegoo CC 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.08mm Optimal @Elegoo CC 0.2 nozzle.json index 5673d99376..ee5b5e815f 100644 --- a/resources/profiles/Elegoo/process/ECC/0.08mm Optimal @Elegoo CC 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.08mm Optimal @Elegoo CC 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "elefant_foot_compensation": "0.05", - "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", - "layer_height": "0.08", "name": "0.08mm Optimal @Elegoo CC 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", "from": "system", "setting_id": "99XQJJWd9FHtXPEa", - "instantiation": "true" + "instantiation": "true", + "elefant_foot_compensation": "0.05", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/ECC/0.12mm Draft @Elegoo CC 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.12mm Draft @Elegoo CC 0.2 nozzle.json index 4a21f48f65..7de0bb2c42 100644 --- a/resources/profiles/Elegoo/process/ECC/0.12mm Draft @Elegoo CC 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.12mm Draft @Elegoo CC 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", - "layer_height": "0.12", "name": "0.12mm Draft @Elegoo CC 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", "from": "system", "setting_id": "LwyvYtJYTwvDlW5Z", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/ECC/0.12mm Fine @Elegoo CC 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.12mm Fine @Elegoo CC 0.4 nozzle.json index 66ca86dafa..037787bfc2 100644 --- a/resources/profiles/Elegoo/process/ECC/0.12mm Fine @Elegoo CC 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.12mm Fine @Elegoo CC 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", - "layer_height": "0.12", "name": "0.12mm Fine @Elegoo CC 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "from": "system", - "wall_loops": "3", "setting_id": "340MqJEmv7j7xiOz", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/ECC/0.14mm Extra Draft @Elegoo CC 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.14mm Extra Draft @Elegoo CC 0.2 nozzle.json index f30ff023ab..05680ce052 100644 --- a/resources/profiles/Elegoo/process/ECC/0.14mm Extra Draft @Elegoo CC 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.14mm Extra Draft @Elegoo CC 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", - "layer_height": "0.14", "name": "0.14mm Extra Draft @Elegoo CC 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC 0.2 nozzle", "from": "system", "setting_id": "Z5WZBJIWjzOpucn2", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.14" } diff --git a/resources/profiles/Elegoo/process/ECC/0.16mm Extra Fine @Elegoo CC 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.16mm Extra Fine @Elegoo CC 0.8 nozzle.json index 6ea50dcd4d..f879a64262 100644 --- a/resources/profiles/Elegoo/process/ECC/0.16mm Extra Fine @Elegoo CC 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.16mm Extra Fine @Elegoo CC 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.16", "name": "0.16mm Extra Fine @Elegoo CC 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", "from": "system", "setting_id": "1pAr6ZTtBBXzHoUw", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/ECC/0.16mm Optimal @Elegoo CC 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.16mm Optimal @Elegoo CC 0.4 nozzle.json index 20391d67eb..cc24a259f6 100644 --- a/resources/profiles/Elegoo/process/ECC/0.16mm Optimal @Elegoo CC 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.16mm Optimal @Elegoo CC 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", - "layer_height": "0.16", "name": "0.16mm Optimal @Elegoo CC 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "from": "system", "setting_id": "drsSvJoMY02R1hyF", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/ECC/0.18mm Fine @Elegoo CC 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.18mm Fine @Elegoo CC 0.6 nozzle.json index 547b84689f..bb34313938 100644 --- a/resources/profiles/Elegoo/process/ECC/0.18mm Fine @Elegoo CC 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.18mm Fine @Elegoo CC 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", - "layer_height": "0.18", "name": "0.18mm Fine @Elegoo CC 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", "from": "system", "setting_id": "bmv0UtvbzVHeOF4Q", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.18" } diff --git a/resources/profiles/Elegoo/process/ECC/0.20mm Strength @Elegoo CC 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.20mm Strength @Elegoo CC 0.4 nozzle.json index c91e5af39d..d34f85b66f 100644 --- a/resources/profiles/Elegoo/process/ECC/0.20mm Strength @Elegoo CC 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.20mm Strength @Elegoo CC 0.4 nozzle.json @@ -1,8 +1,10 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "name": "0.20mm Strength @Elegoo CC 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "from": "system", + "setting_id": "1OQrGLkl8fwRTEDT", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "bottom_shell_layers": "5", @@ -10,7 +12,5 @@ "print_flow_ratio": "0.95", "sparse_infill_density": "20%", "top_shell_layers": "6", - "wall_loops": "6", - "setting_id": "1OQrGLkl8fwRTEDT", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/ECC/0.24mm Draft @Elegoo CC 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.24mm Draft @Elegoo CC 0.4 nozzle.json index e59c6de6b4..da3b132b6a 100644 --- a/resources/profiles/Elegoo/process/ECC/0.24mm Draft @Elegoo CC 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.24mm Draft @Elegoo CC 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", - "layer_height": "0.24", "name": "0.24mm Draft @Elegoo CC 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "from": "system", "setting_id": "PMeZoCKetIP9VQZM", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC/0.24mm Fine @Elegoo CC 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.24mm Fine @Elegoo CC 0.8 nozzle.json index bacdbd0ca9..82dd9cbca4 100644 --- a/resources/profiles/Elegoo/process/ECC/0.24mm Fine @Elegoo CC 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.24mm Fine @Elegoo CC 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.24", "name": "0.24mm Fine @Elegoo CC 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", "from": "system", "setting_id": "6sqS6WmJX9aYJymC", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC/0.24mm Optimal @Elegoo CC 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.24mm Optimal @Elegoo CC 0.6 nozzle.json index 7e25c9177f..a92338f4de 100644 --- a/resources/profiles/Elegoo/process/ECC/0.24mm Optimal @Elegoo CC 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.24mm Optimal @Elegoo CC 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", - "layer_height": "0.24", "name": "0.24mm Optimal @Elegoo CC 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", "from": "system", "setting_id": "hIJP5FSSmLy6bMcK", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC/0.28mm Extra Draft @Elegoo CC 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.28mm Extra Draft @Elegoo CC 0.4 nozzle.json index 1b03db5ce9..80f65df58d 100644 --- a/resources/profiles/Elegoo/process/ECC/0.28mm Extra Draft @Elegoo CC 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.28mm Extra Draft @Elegoo CC 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", - "layer_height": "0.28", "name": "0.28mm Extra Draft @Elegoo CC 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC 0.4 nozzle", "from": "system", "setting_id": "6A6cE25ThuCqP7wi", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/ECC/0.30mm Strength @Elegoo CC 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.30mm Strength @Elegoo CC 0.6 nozzle.json index 33d040c984..f14883ffe6 100644 --- a/resources/profiles/Elegoo/process/ECC/0.30mm Strength @Elegoo CC 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.30mm Strength @Elegoo CC 0.6 nozzle.json @@ -1,15 +1,15 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", - "inner_wall_speed": "120", "name": "0.30mm Strength @Elegoo CC 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", "from": "system", + "setting_id": "b3rbevf3CUh8I05M", + "instantiation": "true", + "inner_wall_speed": "120", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "outer_wall_speed": "80", "sparse_infill_density": "15%", "top_surface_speed": "120", - "wall_loops": "4", - "setting_id": "b3rbevf3CUh8I05M", - "instantiation": "true" + "wall_loops": "4" } diff --git a/resources/profiles/Elegoo/process/ECC/0.32mm Optimal @Elegoo CC 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.32mm Optimal @Elegoo CC 0.8 nozzle.json index 654a49c1c5..8725296220 100644 --- a/resources/profiles/Elegoo/process/ECC/0.32mm Optimal @Elegoo CC 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.32mm Optimal @Elegoo CC 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", - "layer_height": "0.32", "name": "0.32mm Optimal @Elegoo CC 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", "from": "system", "setting_id": "Kez7FhiJRPdChlgg", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/ECC/0.36mm Draft @Elegoo CC 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.36mm Draft @Elegoo CC 0.6 nozzle.json index eaed462a3e..197ebfc0a3 100644 --- a/resources/profiles/Elegoo/process/ECC/0.36mm Draft @Elegoo CC 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.36mm Draft @Elegoo CC 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", - "layer_height": "0.36", "name": "0.36mm Draft @Elegoo CC 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", "from": "system", "setting_id": "pigdfIs4DLj6QswL", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/ECC/0.42mm Extra Draft @Elegoo CC 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.42mm Extra Draft @Elegoo CC 0.6 nozzle.json index c1fd90decf..1f6bb2fbb7 100644 --- a/resources/profiles/Elegoo/process/ECC/0.42mm Extra Draft @Elegoo CC 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.42mm Extra Draft @Elegoo CC 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", - "layer_height": "0.42", "name": "0.42mm Extra Draft @Elegoo CC 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC 0.6 nozzle", "from": "system", "setting_id": "griDT2q7IdUWT7hr", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/ECC/0.48mm Draft @Elegoo CC 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC/0.48mm Draft @Elegoo CC 0.8 nozzle.json index 775f515837..3b571e8079 100644 --- a/resources/profiles/Elegoo/process/ECC/0.48mm Draft @Elegoo CC 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC/0.48mm Draft @Elegoo CC 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", - "layer_height": "0.48", "name": "0.48mm Draft @Elegoo CC 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC 0.8 nozzle", "from": "system", "setting_id": "tpCT2ow532mcwKcd", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.08mm Optimal @Elegoo CC2 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.08mm Optimal @Elegoo CC2 0.2 nozzle.json index 82dc23f427..8b4947373f 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.08mm Optimal @Elegoo CC2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.08mm Optimal @Elegoo CC2 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "elefant_foot_compensation": "0.05", - "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", - "layer_height": "0.08", "name": "0.08mm Optimal @Elegoo CC2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", "from": "system", "setting_id": "uD5gceL1thOzkzGo", - "instantiation": "true" + "instantiation": "true", + "elefant_foot_compensation": "0.05", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.12mm Draft @Elegoo CC2 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.12mm Draft @Elegoo CC2 0.2 nozzle.json index e570db58fc..19784aedec 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.12mm Draft @Elegoo CC2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.12mm Draft @Elegoo CC2 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", - "layer_height": "0.12", "name": "0.12mm Draft @Elegoo CC2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", "from": "system", "setting_id": "cGFwf6ddNwMmqs9h", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.12mm Fine @Elegoo CC2 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.12mm Fine @Elegoo CC2 0.4 nozzle.json index 85705f0aa9..e5a793903d 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.12mm Fine @Elegoo CC2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.12mm Fine @Elegoo CC2 0.4 nozzle.json @@ -1,13 +1,13 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", - "layer_height": "0.12", "name": "0.12mm Fine @Elegoo CC2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "from": "system", + "setting_id": "lRhdk46FwTwzcCYh", + "instantiation": "true", + "layer_height": "0.12", "wall_loops": "3", "support_bottom_z_distance": "0.2", "support_top_z_distance": "0.2", - "top_solid_infill_flow_ratio": "1.09", - "setting_id": "lRhdk46FwTwzcCYh", - "instantiation": "true" + "top_solid_infill_flow_ratio": "1.09" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.14mm Extra Draft @Elegoo CC2 0.2 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.14mm Extra Draft @Elegoo CC2 0.2 nozzle.json index 69934b5680..1ec3f6f14d 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.14mm Extra Draft @Elegoo CC2 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.14mm Extra Draft @Elegoo CC2 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", - "layer_height": "0.14", "name": "0.14mm Extra Draft @Elegoo CC2 0.2 nozzle", + "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle", "from": "system", "setting_id": "falXCyvjKInAQBuU", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.14" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.16mm Extra Fine @Elegoo CC2 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.16mm Extra Fine @Elegoo CC2 0.8 nozzle.json index e5de49c2fc..65bf021f37 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.16mm Extra Fine @Elegoo CC2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.16mm Extra Fine @Elegoo CC2 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.16", "name": "0.16mm Extra Fine @Elegoo CC2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", "from": "system", "setting_id": "fkdUtfBU1HkWIIvT", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.16mm Optimal @Elegoo CC2 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.16mm Optimal @Elegoo CC2 0.4 nozzle.json index 82cebc5760..9fb8d633c4 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.16mm Optimal @Elegoo CC2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.16mm Optimal @Elegoo CC2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", - "layer_height": "0.16", "name": "0.16mm Optimal @Elegoo CC2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "from": "system", "setting_id": "et3r9GAefxCq9TSq", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.18mm Fine @Elegoo CC2 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.18mm Fine @Elegoo CC2 0.6 nozzle.json index a8c83adc07..739c4695b1 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.18mm Fine @Elegoo CC2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.18mm Fine @Elegoo CC2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", - "layer_height": "0.18", "name": "0.18mm Fine @Elegoo CC2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", "from": "system", "setting_id": "zpijb8su3jIgrND9", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.18" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.20mm Strength @Elegoo CC2 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.20mm Strength @Elegoo CC2 0.4 nozzle.json index d3374f99e0..92db8b43a7 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.20mm Strength @Elegoo CC2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.20mm Strength @Elegoo CC2 0.4 nozzle.json @@ -1,8 +1,10 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "name": "0.20mm Strength @Elegoo CC2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "from": "system", + "setting_id": "jTiebnbHJERoOZ2Y", + "instantiation": "true", "wall_sequence": "inner wall/outer wall", "reduce_crossing_wall": "0", "bottom_shell_layers": "5", @@ -11,7 +13,5 @@ "sparse_infill_density": "20%", "top_shell_layers": "6", "wall_loops": "5", - "top_solid_infill_flow_ratio": "1.09", - "setting_id": "jTiebnbHJERoOZ2Y", - "instantiation": "true" + "top_solid_infill_flow_ratio": "1.09" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.24mm Draft @Elegoo CC2 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.24mm Draft @Elegoo CC2 0.4 nozzle.json index cb28d46e8d..fd84b8c167 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.24mm Draft @Elegoo CC2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.24mm Draft @Elegoo CC2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", - "layer_height": "0.24", "name": "0.24mm Draft @Elegoo CC2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "from": "system", "setting_id": "dw8ZgRee5mUlNdon", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.24mm Fine @Elegoo CC2 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.24mm Fine @Elegoo CC2 0.8 nozzle.json index 1df6cf54a0..111f740966 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.24mm Fine @Elegoo CC2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.24mm Fine @Elegoo CC2 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", - "initial_layer_print_height": "0.3", - "layer_height": "0.24", "name": "0.24mm Fine @Elegoo CC2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", "from": "system", "setting_id": "TrKMkazV6my94O8Q", - "instantiation": "true" + "instantiation": "true", + "initial_layer_print_height": "0.3", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.24mm Optimal @Elegoo CC2 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.24mm Optimal @Elegoo CC2 0.6 nozzle.json index e559bf36ca..b9d53c20bc 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.24mm Optimal @Elegoo CC2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.24mm Optimal @Elegoo CC2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", - "layer_height": "0.24", "name": "0.24mm Optimal @Elegoo CC2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", "from": "system", "setting_id": "VfcmVzpWGuafr5C8", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.28mm Extra Draft @Elegoo CC2 0.4 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.28mm Extra Draft @Elegoo CC2 0.4 nozzle.json index f7259db276..335d024ec0 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.28mm Extra Draft @Elegoo CC2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.28mm Extra Draft @Elegoo CC2 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", - "layer_height": "0.28", "name": "0.28mm Extra Draft @Elegoo CC2 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle", "from": "system", "setting_id": "iOd2EdXRnWMT6VZM", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.30mm Strength @Elegoo CC2 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.30mm Strength @Elegoo CC2 0.6 nozzle.json index 7b67d63e18..798c769cd2 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.30mm Strength @Elegoo CC2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.30mm Strength @Elegoo CC2 0.6 nozzle.json @@ -1,15 +1,15 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", - "inner_wall_speed": "120", "name": "0.30mm Strength @Elegoo CC2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", "from": "system", + "setting_id": "qvgkuo9AInajHCez", + "instantiation": "true", + "inner_wall_speed": "120", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "outer_wall_speed": "80", "sparse_infill_density": "15%", "top_surface_speed": "120", - "wall_loops": "4", - "setting_id": "qvgkuo9AInajHCez", - "instantiation": "true" + "wall_loops": "4" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.32mm Optimal @Elegoo CC2 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.32mm Optimal @Elegoo CC2 0.8 nozzle.json index e84edc7edf..1caa6083a2 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.32mm Optimal @Elegoo CC2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.32mm Optimal @Elegoo CC2 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", - "layer_height": "0.32", "name": "0.32mm Optimal @Elegoo CC2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", "from": "system", "setting_id": "3l5lU1sBxbMAzV6x", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.36mm Draft @Elegoo CC2 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.36mm Draft @Elegoo CC2 0.6 nozzle.json index 41479b76b1..e892c976fd 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.36mm Draft @Elegoo CC2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.36mm Draft @Elegoo CC2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", - "layer_height": "0.36", "name": "0.36mm Draft @Elegoo CC2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", "from": "system", "setting_id": "S1MtBrEo884gfhm3", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.42mm Extra Draft @Elegoo CC2 0.6 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.42mm Extra Draft @Elegoo CC2 0.6 nozzle.json index debbe6ef13..10f98d7d2e 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.42mm Extra Draft @Elegoo CC2 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.42mm Extra Draft @Elegoo CC2 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", - "layer_height": "0.42", "name": "0.42mm Extra Draft @Elegoo CC2 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle", "from": "system", "setting_id": "Du73E9Zw3cOyKZYb", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/ECC2/0.48mm Draft @Elegoo CC2 0.8 nozzle.json b/resources/profiles/Elegoo/process/ECC2/0.48mm Draft @Elegoo CC2 0.8 nozzle.json index 08006c453f..b7786ea559 100644 --- a/resources/profiles/Elegoo/process/ECC2/0.48mm Draft @Elegoo CC2 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/ECC2/0.48mm Draft @Elegoo CC2 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", - "layer_height": "0.48", "name": "0.48mm Draft @Elegoo CC2 0.8 nozzle", + "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle", "from": "system", "setting_id": "K7hJQ2Kzyu7kgmCx", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.12mm Fine @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.12mm Fine @Elegoo Neptune 0.4 nozzle.json index cd7a6f60ae..b7a1867e5a 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.12mm Fine @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.12mm Fine @Elegoo Neptune 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "setting_id": "x7ZbjKUNtGbCsJWr", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", "name": "0.12mm Fine @Elegoo Neptune 0.4 nozzle", - "layer_height": "0.12", - "wall_loops": "3", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune;0.08mm Extra Fine @Elegoo Neptune2;0.08mm Extra Fine @Elegoo Neptune2D;0.08mm Extra Fine @Elegoo Neptune2S;0.08mm Extra Fine @Elegoo NeptuneX;0.12mm Fine @Elegoo Neptune;0.12mm Fine @Elegoo Neptune2;0.12mm Fine @Elegoo Neptune2D;0.12mm Fine @Elegoo Neptune2S;0.12mm Fine @Elegoo NeptuneX", + "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", + "from": "system", + "setting_id": "x7ZbjKUNtGbCsJWr", "instantiation": "true", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune;0.08mm Extra Fine @Elegoo Neptune2;0.08mm Extra Fine @Elegoo Neptune2D;0.08mm Extra Fine @Elegoo Neptune2S;0.08mm Extra Fine @Elegoo NeptuneX;0.12mm Fine @Elegoo Neptune;0.12mm Fine @Elegoo Neptune2;0.12mm Fine @Elegoo Neptune2D;0.12mm Fine @Elegoo Neptune2S;0.12mm Fine @Elegoo NeptuneX" + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.16mm Optimal @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.16mm Optimal @Elegoo Neptune 0.4 nozzle.json index c616506306..79e11c97f4 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.16mm Optimal @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.16mm Optimal @Elegoo Neptune 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "dmdjW1ZxuWAXgArQ", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", "name": "0.16mm Optimal @Elegoo Neptune 0.4 nozzle", - "layer_height": "0.16", + "renamed_from": "0.16mm Optimal @Elegoo Neptune;0.16mm Optimal @Elegoo Neptune2;0.16mm Optimal @Elegoo Neptune2D;0.16mm Optimal @Elegoo Neptune2S;0.16mm Optimal @Elegoo NeptuneX", + "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", + "from": "system", + "setting_id": "dmdjW1ZxuWAXgArQ", "instantiation": "true", - "renamed_from": "0.16mm Optimal @Elegoo Neptune;0.16mm Optimal @Elegoo Neptune2;0.16mm Optimal @Elegoo Neptune2D;0.16mm Optimal @Elegoo Neptune2S;0.16mm Optimal @Elegoo NeptuneX" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Standard @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Standard @Elegoo Neptune 0.4 nozzle.json index fce4e6ea2a..b1d56aef44 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Standard @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Standard @Elegoo Neptune 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "ivuelLxit3DxpCQf", "name": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune;0.20mm Standard @Elegoo Neptune2;0.20mm Standard @Elegoo Neptune2D;0.20mm Standard @Elegoo Neptune2S;0.20mm Standard @Elegoo NeptuneX", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "ivuelLxit3DxpCQf", "instantiation": "true", "filename_format": "{nozzle_diameter[0]}{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "1000", @@ -34,6 +35,5 @@ "Elegoo Neptune 2S 0.4 nozzle", "Elegoo Neptune 2D 0.4 nozzle", "Elegoo Neptune 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune;0.20mm Standard @Elegoo Neptune2;0.20mm Standard @Elegoo Neptune2D;0.20mm Standard @Elegoo Neptune2S;0.20mm Standard @Elegoo NeptuneX" + ] } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Strength @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Strength @Elegoo Neptune 0.4 nozzle.json index e7c2cc6460..56ea858aa7 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Strength @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.20mm Strength @Elegoo Neptune 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "setting_id": "7o8beRTTV9kahf6c", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", "name": "0.20mm Strength @Elegoo Neptune 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", + "from": "system", + "setting_id": "7o8beRTTV9kahf6c", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", - "wall_loops": "6", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Draft @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Draft @Elegoo Neptune 0.4 nozzle.json index 939d9d3e0d..4d5178d0ff 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Draft @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Draft @Elegoo Neptune 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "AQnZ1c7zUfkqHzUV", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", "name": "0.24mm Draft @Elegoo Neptune 0.4 nozzle", - "layer_height": "0.24", + "renamed_from": "0.24mm Draft @Elegoo Neptune;0.24mm Draft @Elegoo Neptune2;0.24mm Draft @Elegoo Neptune2D;0.24mm Draft @Elegoo Neptune2S;0.24mm Draft @Elegoo NeptuneX", + "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", + "from": "system", + "setting_id": "AQnZ1c7zUfkqHzUV", "instantiation": "true", - "renamed_from": "0.24mm Draft @Elegoo Neptune;0.24mm Draft @Elegoo Neptune2;0.24mm Draft @Elegoo Neptune2D;0.24mm Draft @Elegoo Neptune2S;0.24mm Draft @Elegoo NeptuneX" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Fine @Elegoo Neptune 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Fine @Elegoo Neptune 0.8 nozzle.json index 5ecf1d6597..1195505088 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Fine @Elegoo Neptune 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Fine @Elegoo Neptune 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "58PjDN7iOw2uuKCa", - "from": "system", "name": "0.24mm Fine @Elegoo Neptune 0.8 nozzle", "inherits": "0.40mm Standard @Elegoo Neptune 0.8 nozzle", - "layer_height": "0.24", - "instantiation": "true" + "from": "system", + "setting_id": "58PjDN7iOw2uuKCa", + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Optimal @Elegoo Neptune 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Optimal @Elegoo Neptune 0.6 nozzle.json index 4564e2836a..c0e47c5aa5 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Optimal @Elegoo Neptune 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.24mm Optimal @Elegoo Neptune 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "9TcC7ocHTTV5fO6u", - "from": "system", "name": "0.24mm Optimal @Elegoo Neptune 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Neptune 0.6 nozzle", - "layer_height": "0.24", - "instantiation": "true" + "from": "system", + "setting_id": "9TcC7ocHTTV5fO6u", + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.28mm Extra Draft @Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.28mm Extra Draft @Elegoo Neptune 0.4 nozzle.json index dc1f40365c..8751d16bec 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.28mm Extra Draft @Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.28mm Extra Draft @Elegoo Neptune 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "gZWSfkY2eEsk2BOj", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo Neptune 0.4 nozzle", - "layer_height": "0.28", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune;0.28mm Extra Draft @Elegoo Neptune2;0.28mm Extra Draft @Elegoo Neptune2D;0.28mm Extra Draft @Elegoo Neptune2S;0.28mm Extra Draft @Elegoo NeptuneX", + "inherits": "0.20mm Standard @Elegoo Neptune 0.4 nozzle", + "from": "system", + "setting_id": "gZWSfkY2eEsk2BOj", "instantiation": "true", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune;0.28mm Extra Draft @Elegoo Neptune2;0.28mm Extra Draft @Elegoo Neptune2D;0.28mm Extra Draft @Elegoo Neptune2S;0.28mm Extra Draft @Elegoo NeptuneX" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.32mm Optimal @Elegoo Neptune 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.32mm Optimal @Elegoo Neptune 0.8 nozzle.json index 21508d6fcb..30262f4649 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.32mm Optimal @Elegoo Neptune 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.32mm Optimal @Elegoo Neptune 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "pubCZO4TSk26n9tN", - "from": "system", "name": "0.32mm Optimal @Elegoo Neptune 0.8 nozzle", "inherits": "0.40mm Standard @Elegoo Neptune 0.8 nozzle", - "layer_height": "0.32", - "instantiation": "true" + "from": "system", + "setting_id": "pubCZO4TSk26n9tN", + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.36mm Draft @Elegoo Neptune 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.36mm Draft @Elegoo Neptune 0.6 nozzle.json index 2c70c48f96..3fa40e6835 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.36mm Draft @Elegoo Neptune 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.36mm Draft @Elegoo Neptune 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "3uIERa8zvsPoVkk8", - "from": "system", "name": "0.36mm Draft @Elegoo Neptune 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Neptune 0.6 nozzle", - "layer_height": "0.36", - "instantiation": "true" + "from": "system", + "setting_id": "3uIERa8zvsPoVkk8", + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN2SERIES/0.42mm Extra Draft @Elegoo Neptune 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN2SERIES/0.42mm Extra Draft @Elegoo Neptune 0.6 nozzle.json index d0deeae0cd..e99545bc37 100644 --- a/resources/profiles/Elegoo/process/EN2SERIES/0.42mm Extra Draft @Elegoo Neptune 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN2SERIES/0.42mm Extra Draft @Elegoo Neptune 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "xvfDVb6XEH8USrny", - "from": "system", "name": "0.42mm Extra Draft @Elegoo Neptune 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Neptune 0.6 nozzle", - "layer_height": "0.42", - "instantiation": "true" + "from": "system", + "setting_id": "xvfDVb6XEH8USrny", + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Max 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Max 0.2 nozzle.json index c7551fea08..34ff7bf326 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Max 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N3Max 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Max 0.2 nozzle", - "layer_height": "0.08", + "from": "system", "setting_id": "XEXWDtkuVN27Z0Ae", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Plus 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Plus 0.2 nozzle.json index 751845d1a7..4e47fdf3b2 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Plus 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N3Plus 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Plus 0.2 nozzle", - "layer_height": "0.08", + "from": "system", "setting_id": "oRNlKaMaOZS6N4pT", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Pro 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Pro 0.2 nozzle.json index 98dc95f83c..91f6449c43 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.08mm Optimal @Elegoo N3Pro 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N3Pro 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Pro 0.2 nozzle", - "layer_height": "0.08", + "from": "system", "setting_id": "4d4rm5pkuVEpvKUA", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Max 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Max 0.2 nozzle.json index 593b54ea29..eb407e5674 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Max 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N3Max 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Max 0.2 nozzle", + "from": "system", "setting_id": "0tL8rTEK1rEksfWu", "instantiation": "true", "layer_height": "0.12" diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Plus 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Plus 0.2 nozzle.json index ac73a53ff0..001848ec26 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Plus 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N3Plus 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Plus 0.2 nozzle", - "layer_height": "0.12", + "from": "system", "setting_id": "4H7asjR6qAfYD1zA", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Pro 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Pro 0.2 nozzle.json index 93e0053162..52b0b59650 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Draft @Elegoo N3Pro 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N3Pro 0.2 nozzle", - "from": "system", "inherits": "0.10mm Standard @Elegoo N3Pro 0.2 nozzle", - "layer_height": "0.12", + "from": "system", "setting_id": "B5TzYBAO9JaSXfj8", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Max 0.4 nozzle.json index df15921fc8..310f13fc98 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Max 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", "name": "0.12mm Fine @Elegoo N3Max 0.4 nozzle", - "layer_height": "0.12", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3Max;0.12mm Fine @Elegoo Neptune3Max", + "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", + "from": "system", "setting_id": "EvN6TYCeyMKxI6Re", "instantiation": "true", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3Max;0.12mm Fine @Elegoo Neptune3Max" + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Plus 0.4 nozzle.json index 3ea7659416..41f6f6683b 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", "name": "0.12mm Fine @Elegoo N3Plus 0.4 nozzle", - "layer_height": "0.12", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3Plus;0.12mm Fine @Elegoo Neptune3Plus", + "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", + "from": "system", "setting_id": "7BlZuuOXdqTj6cV6", "instantiation": "true", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3Plus;0.12mm Fine @Elegoo Neptune3Plus" + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Pro 0.4 nozzle.json index e4e8b01040..6050a1a9cd 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.12mm Fine @Elegoo N3Pro 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", "name": "0.12mm Fine @Elegoo N3Pro 0.4 nozzle", - "layer_height": "0.12", - "wall_loops": "3", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3;0.08mm Extra Fine @Elegoo Neptune3Pro;0.12mm Fine @Elegoo Neptune3;0.12mm Fine @Elegoo Neptune3Pro", + "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", + "from": "system", "setting_id": "sxbVyUoQQwvDwEgm", "instantiation": "true", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune3;0.08mm Extra Fine @Elegoo Neptune3Pro;0.12mm Fine @Elegoo Neptune3;0.12mm Fine @Elegoo Neptune3Pro" + "layer_height": "0.12", + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Max 0.4 nozzle.json index e6f3e04bc7..2fe8babd91 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", "name": "0.16mm Optimal @Elegoo N3Max 0.4 nozzle", - "layer_height": "0.16", + "renamed_from": "0.16mm Optimal @Elegoo Neptune3Max", + "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", + "from": "system", "setting_id": "TCM0SNa96VA5Dx2H", "instantiation": "true", - "renamed_from": "0.16mm Optimal @Elegoo Neptune3Max" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Plus 0.4 nozzle.json index bdcacf92c7..0d0c52e654 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", "name": "0.16mm Optimal @Elegoo N3Plus 0.4 nozzle", - "layer_height": "0.16", + "renamed_from": "0.16mm Optimal @Elegoo Neptune3Plus", + "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", + "from": "system", "setting_id": "WZhze0PkeqiyOdrj", "instantiation": "true", - "renamed_from": "0.16mm Optimal @Elegoo Neptune3Plus" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Pro 0.4 nozzle.json index 823a13b1be..bc0864f976 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.16mm Optimal @Elegoo N3Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", "name": "0.16mm Optimal @Elegoo N3Pro 0.4 nozzle", - "layer_height": "0.16", + "renamed_from": "0.16mm Optimal @Elegoo Neptune3;0.16mm Optimal @Elegoo Neptune3Pro", + "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", + "from": "system", "setting_id": "xSjvTTFHSiKGi5vc", "instantiation": "true", - "renamed_from": "0.16mm Optimal @Elegoo Neptune3;0.16mm Optimal @Elegoo Neptune3Pro" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Max 0.4 nozzle.json index badc9335be..0cd5f99157 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Max 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "YVbjgCkFSIfI9zDy", "name": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune3Max", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "YVbjgCkFSIfI9zDy", "instantiation": "true", "filename_format": "EN3Max_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "gap_infill_speed": "30", @@ -26,6 +27,5 @@ "travel_speed": "150", "compatible_printers": [ "Elegoo Neptune 3 Max 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune3Max" + ] } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Plus 0.4 nozzle.json index beb35d4ae7..00b47f0dbc 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Plus 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "t2QdKzmUAoGrZTl2", "name": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune3Plus", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "t2QdKzmUAoGrZTl2", "instantiation": "true", "filename_format": "EN3Plus_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "1000", @@ -26,6 +27,5 @@ "travel_speed": "200", "compatible_printers": [ "Elegoo Neptune 3 Plus 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune3Plus" + ] } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Pro 0.4 nozzle.json index 68635c0424..eabbef58d0 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Standard @Elegoo N3Pro 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "Z6E0SkSXvbyrgCwI", "name": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune3;0.20mm Standard @Elegoo Neptune3Pro", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "Z6E0SkSXvbyrgCwI", "instantiation": "true", "filename_format": "EN3Pro_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "1000", @@ -26,6 +27,5 @@ "travel_speed": "200", "compatible_printers": [ "Elegoo Neptune 3 Pro 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune3;0.20mm Standard @Elegoo Neptune3Pro" + ] } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Max 0.4 nozzle.json index 5e666a782f..cb5d6ce635 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Max 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", "name": "0.20mm Strength @Elegoo N3Max 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", + "from": "system", + "setting_id": "F9cFxKIj5tmaKw0q", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", - "wall_loops": "6", - "setting_id": "F9cFxKIj5tmaKw0q", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Plus 0.4 nozzle.json index b5b6ce375a..1d98f8670c 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", "name": "0.20mm Strength @Elegoo N3Plus 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", + "from": "system", + "setting_id": "dUTKuxKR2EutaNmT", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", - "wall_loops": "6", - "setting_id": "dUTKuxKR2EutaNmT", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Pro 0.4 nozzle.json index a369fa15e4..e2739cccf6 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.20mm Strength @Elegoo N3Pro 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", "name": "0.20mm Strength @Elegoo N3Pro 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", + "from": "system", + "setting_id": "8A1LaTaH5mFRXIRT", + "instantiation": "true", "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", - "wall_loops": "6", - "setting_id": "8A1LaTaH5mFRXIRT", - "instantiation": "true" + "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Max 0.4 nozzle.json index 81bbeed822..8ea3de4a8a 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", "name": "0.24mm Draft @Elegoo N3Max 0.4 nozzle", - "layer_height": "0.24", + "renamed_from": "0.24mm Draft @Elegoo Neptune3Max", + "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", + "from": "system", "setting_id": "4cjFrdHJQUTXPlhY", "instantiation": "true", - "renamed_from": "0.24mm Draft @Elegoo Neptune3Max" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Plus 0.4 nozzle.json index 647186a296..583b2b0aa9 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", "name": "0.24mm Draft @Elegoo N3Plus 0.4 nozzle", - "layer_height": "0.24", + "renamed_from": "0.24mm Draft @Elegoo Neptune3Plus", + "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", + "from": "system", "setting_id": "YVe8MEaJXZUeE3h4", "instantiation": "true", - "renamed_from": "0.24mm Draft @Elegoo Neptune3Plus" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Pro 0.4 nozzle.json index 84bfc06411..3c4c32a08e 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Draft @Elegoo N3Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", "name": "0.24mm Draft @Elegoo N3Pro 0.4 nozzle", - "layer_height": "0.24", + "renamed_from": "0.24mm Draft @Elegoo Neptune3;0.24mm Draft @Elegoo Neptune3Pro", + "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", + "from": "system", "setting_id": "D8EjvZ18sgk2kVfO", "instantiation": "true", - "renamed_from": "0.24mm Draft @Elegoo Neptune3;0.24mm Draft @Elegoo Neptune3Pro" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Max 0.8 nozzle.json index 9f1fb265ca..01f46c671b 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Max 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N3Max 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Max 0.8 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "AIFj2Nkig3Xe3f80", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Plus 0.8 nozzle.json index 05753f9621..7c37971f9d 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Plus 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N3Plus 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Plus 0.8 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "Fo9SwcT3g26U1cJO", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Pro 0.8 nozzle.json index 2c43b42df2..900bd39899 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Fine @Elegoo N3Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N3Pro 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Pro 0.8 nozzle", + "from": "system", "setting_id": "QEh6pEz7MS4x51QA", "instantiation": "true", "layer_height": "0.24" diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Max 0.6 nozzle.json index 9284fa65e4..ff37a1d0f2 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Max 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N3Max 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Max 0.6 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "sRz0TXDOEWnLxXh5", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Plus 0.6 nozzle.json index dbf6f01505..c71c7c422d 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Plus 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N3Plus 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Plus 0.6 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "T7cpTs4IIK8zix8P", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Pro 0.6 nozzle.json index a0fbc1a58b..52ea4e8c08 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.24mm Optimal @Elegoo N3Pro 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N3Pro 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Pro 0.6 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "T2QWt3peRdwFJFXE", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Max 0.4 nozzle.json index 5feef5dfe9..168d00b90f 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N3Max 0.4 nozzle", - "layer_height": "0.28", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3Max", + "inherits": "0.20mm Standard @Elegoo N3Max 0.4 nozzle", + "from": "system", "setting_id": "nJX8mCa1nrWxYsEd", "instantiation": "true", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3Max" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Plus 0.4 nozzle.json index 45b060a748..ae7381a4a4 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N3Plus 0.4 nozzle", - "layer_height": "0.28", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3Plus", + "inherits": "0.20mm Standard @Elegoo N3Plus 0.4 nozzle", + "from": "system", "setting_id": "7ZbuPzdEsBEeZlOC", "instantiation": "true", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3Plus" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Pro 0.4 nozzle.json index fbfcb2f8c4..d6d3d8eb3d 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.28mm Extra Draft @Elegoo N3Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N3Pro 0.4 nozzle", - "layer_height": "0.28", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3;0.28mm Extra Draft @Elegoo Neptune3Pro", + "inherits": "0.20mm Standard @Elegoo N3Pro 0.4 nozzle", + "from": "system", "setting_id": "pcBUWmShCb8ii1Ro", "instantiation": "true", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune3;0.28mm Extra Draft @Elegoo Neptune3Pro" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Max 1.0 nozzle.json index 524e501772..413db6d902 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Max 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N3Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Max 1.0 nozzle", - "layer_height": "0.3", + "from": "system", "setting_id": "HMDmYxoPgPEF3o2k", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Plus 1.0 nozzle.json index 88ad4e385a..121f851b6c 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Plus 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N3Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Plus 1.0 nozzle", - "layer_height": "0.3", + "from": "system", "setting_id": "nnGIKTAThcIjqiNY", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Pro 1.0 nozzle.json index d33a7620be..f22d330a05 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.30mm Fine @Elegoo N3Pro 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N3Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Pro 1.0 nozzle", - "layer_height": "0.3", + "from": "system", "setting_id": "PGLk0C6CFjdJgUD2", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.3" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Max 0.8 nozzle.json index 540bafd120..a46bb223e2 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Max 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N3Max 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Max 0.8 nozzle", - "layer_height": "0.32", + "from": "system", "setting_id": "EuI4NCtPdnDgCwod", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Plus 0.8 nozzle.json index de45890943..e3e6ad27cc 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Plus 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N3Plus 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Plus 0.8 nozzle", - "layer_height": "0.32", + "from": "system", "setting_id": "cWbafri96E6xdetF", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Pro 0.8 nozzle.json index 2b0823c3fb..24a6026cc0 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.32mm Optimal @Elegoo N3Pro 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N3Pro 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Pro 0.8 nozzle", - "layer_height": "0.32", + "from": "system", "setting_id": "JyNhgxXpE3QGd22F", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Max 0.6 nozzle.json index 3a5b561cb7..7936351746 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Max 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N3Max 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Max 0.6 nozzle", - "layer_height": "0.36", + "from": "system", "setting_id": "lyUQ9qqdlT3xOjLa", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Plus 0.6 nozzle.json index ab050a47a5..c0aa4c85a1 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Plus 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N3Plus 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Plus 0.6 nozzle", - "layer_height": "0.36", + "from": "system", "setting_id": "9fgmDydMRIQt1EMc", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Pro 0.6 nozzle.json index 4d306b8c9c..477693abdb 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.36mm Draft @Elegoo N3Pro 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N3Pro 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Pro 0.6 nozzle", - "layer_height": "0.36", + "from": "system", "setting_id": "y577AyAVfQm2t7MC", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Max 1.0 nozzle.json index b385b6032b..087e4e4187 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Max 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N3Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Max 1.0 nozzle", - "layer_height": "0.4", + "from": "system", "setting_id": "SVth0sMD2ndZBpxW", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.4" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Plus 1.0 nozzle.json index 8671652915..0103f473fc 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Plus 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N3Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Plus 1.0 nozzle", - "layer_height": "0.4", + "from": "system", "setting_id": "Bg9wsz7gRUfhdsxO", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.4" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Pro 1.0 nozzle.json index 24b31b6c1a..f129f697b1 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.40mm Optimal @Elegoo N3Pro 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N3Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Pro 1.0 nozzle", - "layer_height": "0.4", + "from": "system", "setting_id": "TTj088WcmPAL0J2v", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.4" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Max 0.6 nozzle.json index 64e16d4207..d7408a5423 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Max 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N3Max 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Max 0.6 nozzle", - "layer_height": "0.42", + "from": "system", "setting_id": "q8wRFEbNbhFiR68s", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Plus 0.6 nozzle.json index 001039fd99..9baa0bd846 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Plus 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N3Plus 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Plus 0.6 nozzle", - "layer_height": "0.42", + "from": "system", "setting_id": "S3XpelIawW7YF0tp", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Pro 0.6 nozzle.json index 72aa6be907..f34162a375 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.42mm Extra Draft @Elegoo N3Pro 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N3Pro 0.6 nozzle", - "from": "system", "inherits": "0.30mm Standard @Elegoo N3Pro 0.6 nozzle", - "layer_height": "0.42", + "from": "system", "setting_id": "fZmtvPZ1k15dep6l", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Max 0.8 nozzle.json index fc26633f8a..9cebf8ef94 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Max 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N3Max 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Max 0.8 nozzle", - "layer_height": "0.48", + "from": "system", "setting_id": "xpdQ4VMjMsYWaLNA", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Plus 0.8 nozzle.json index f7286e3bb5..c24c66df3c 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Plus 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N3Plus 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Plus 0.8 nozzle", - "layer_height": "0.48", + "from": "system", "setting_id": "5H03Otf81sLLUkRT", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Pro 0.8 nozzle.json index cb5da8f8da..ea5736e51a 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.48mm Draft @Elegoo N3Pro 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N3Pro 0.8 nozzle", - "from": "system", "inherits": "0.40mm Standard @Elegoo N3Pro 0.8 nozzle", - "layer_height": "0.48", + "from": "system", "setting_id": "kC1SOTD5KAkOvmkd", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Max 1.0 nozzle.json index 4334cd2fb8..a924ba7465 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Max 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N3Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Max 1.0 nozzle", - "layer_height": "0.6", + "from": "system", "setting_id": "VDAPQAbVmGJlCEUB", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.6" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Plus 1.0 nozzle.json index 54172dcdbe..81b9e2705e 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Plus 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N3Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Plus 1.0 nozzle", - "layer_height": "0.6", + "from": "system", "setting_id": "M67oOpMsXtZzCcLQ", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.6" } diff --git a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Pro 1.0 nozzle.json index 26d78b0da3..3038e060d6 100644 --- a/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN3SERIES/0.60mm Draft @Elegoo N3Pro 1.0 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N3Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N3Pro 1.0 nozzle", - "layer_height": "0.6", + "from": "system", "setting_id": "FTb0W3wG9mNPkONL", - "instantiation": "true" + "instantiation": "true", + "layer_height": "0.6" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4 0.2 nozzle.json index bb30a9622a..a0902f4a38 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N4 0.2 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4 (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4 0.2 nozzle", + "from": "system", "setting_id": "mPn1wANI8OeyLWGt", "instantiation": "true", - "layer_height": "0.08", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4 (0.2 nozzle)" + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Max 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Max 0.2 nozzle.json index 93bcefb615..a35cfc7024 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Max 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N4Max 0.2 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4Max (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Max 0.2 nozzle", + "from": "system", "setting_id": "n72kCNTZ1ILUzaiJ", "instantiation": "true", - "layer_height": "0.08", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4Max (0.2 nozzle)" + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Plus 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Plus 0.2 nozzle.json index 5f663fb35c..a9db44da77 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Plus 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N4Plus 0.2 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4 Plus (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Plus 0.2 nozzle", + "from": "system", "setting_id": "apACoiYg6U3Z0xwK", "instantiation": "true", - "layer_height": "0.08", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4 Plus (0.2 nozzle)" + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Pro 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Pro 0.2 nozzle.json index ae08228f0f..3435578e98 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.08mm Optimal @Elegoo N4Pro 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.08mm Optimal @Elegoo N4Pro 0.2 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4Pro (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Pro 0.2 nozzle", + "from": "system", "setting_id": "tY0jBQmvK2chT34r", "instantiation": "true", - "layer_height": "0.08", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.2 nozzle);0.16mm Optimal @Elegoo Neptune4Pro (0.2 nozzle)" + "layer_height": "0.08" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4 0.2 nozzle.json index fc4663a2fd..d431496ddc 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10mm Standard @Elegoo N4 0.2 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.2 nozzle)", "inherits": "fdm_process_elegoo_02010", "from": "system", "setting_id": "j8LrMhjmrrWEcnSl", @@ -12,6 +13,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.2 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Max 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Max 0.2 nozzle.json index 793f694514..936cefd906 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Max 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10mm Standard @Elegoo N4Max 0.2 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.2 nozzle)", "inherits": "fdm_process_elegoo_02010", "from": "system", "setting_id": "zFHnOUd2WXdPG1d0", @@ -12,6 +13,5 @@ ], "default_acceleration": "3000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "1500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.2 nozzle)" + "outer_wall_acceleration": "1500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Plus 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Plus 0.2 nozzle.json index 4064775c34..17983a171c 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Plus 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10mm Standard @Elegoo N4Plus 0.2 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.2 nozzle)", "inherits": "fdm_process_elegoo_02010", "from": "system", "setting_id": "RpheR4sGaJlp7yJp", @@ -12,6 +13,5 @@ ], "default_acceleration": "5000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "2500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.2 nozzle)" + "outer_wall_acceleration": "2500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Pro 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Pro 0.2 nozzle.json index 6f611b6f10..856403c945 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.10mm Standard @Elegoo N4Pro 0.2 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10mm Standard @Elegoo N4Pro 0.2 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.2 nozzle)", "inherits": "fdm_process_elegoo_02010", "from": "system", "setting_id": "EH1TvdVsdTCuvv2c", @@ -12,6 +13,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.2 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4 0.2 nozzle.json index fea092f942..903f60ea17 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N4 0.2 nozzle", - "from": "system", + "renamed_from": "0.12mm Fine @Elegoo Neptune4 (0.2 nozzle);0.24mm Draft @Elegoo Neptune4 (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4 (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4 0.2 nozzle", + "from": "system", "setting_id": "Vis3rzOs4NILDE6C", "instantiation": "true", - "layer_height": "0.12", - "renamed_from": "0.12mm Fine @Elegoo Neptune4 (0.2 nozzle);0.24mm Draft @Elegoo Neptune4 (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4 (0.2 nozzle)" + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Max 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Max 0.2 nozzle.json index 318662d214..eac769ef26 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Max 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N4Max 0.2 nozzle", - "from": "system", + "renamed_from": "0.12mm Fine @Elegoo Neptune4Max (0.2 nozzle);0.24mm Draft @Elegoo Neptune4Max (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4Max (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Max 0.2 nozzle", + "from": "system", "setting_id": "BdbN0fjzy0GtRZty", "instantiation": "true", - "layer_height": "0.12", - "renamed_from": "0.12mm Fine @Elegoo Neptune4Max (0.2 nozzle);0.24mm Draft @Elegoo Neptune4Max (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4Max (0.2 nozzle)" + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Plus 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Plus 0.2 nozzle.json index 5e6c3b13b0..1a26f69852 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Plus 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N4Plus 0.2 nozzle", - "from": "system", + "renamed_from": "0.12mm Fine @Elegoo Neptune4 Plus (0.2 nozzle);0.24mm Draft @Elegoo Neptune4 Plus (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4 Plus (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Plus 0.2 nozzle", + "from": "system", "setting_id": "zPlAvLncVwzD1wCI", "instantiation": "true", - "layer_height": "0.12", - "renamed_from": "0.12mm Fine @Elegoo Neptune4 Plus (0.2 nozzle);0.24mm Draft @Elegoo Neptune4 Plus (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4 Plus (0.2 nozzle)" + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Pro 0.2 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Pro 0.2 nozzle.json index 62ceae2703..04fbd5753f 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Pro 0.2 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Draft @Elegoo N4Pro 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.12mm Draft @Elegoo N4Pro 0.2 nozzle", - "from": "system", + "renamed_from": "0.12mm Fine @Elegoo Neptune4Pro (0.2 nozzle);0.24mm Draft @Elegoo Neptune4Pro (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4Pro (0.2 nozzle)", "inherits": "0.10mm Standard @Elegoo N4Pro 0.2 nozzle", + "from": "system", "setting_id": "UpIR8nVGr9eXImwd", "instantiation": "true", - "layer_height": "0.12", - "renamed_from": "0.12mm Fine @Elegoo Neptune4Pro (0.2 nozzle);0.24mm Draft @Elegoo Neptune4Pro (0.2 nozzle);0.28mm Extra Draft @Elegoo Neptune4Pro (0.2 nozzle)" + "layer_height": "0.12" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4 0.4 nozzle.json index 4c4e045ce5..659e6ea759 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", + "name": "0.12mm Fine @Elegoo N4 0.4 nozzle", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.4 nozzle);0.12mm Fine @Elegoo Neptune4 (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", + "from": "system", "setting_id": "RQ9dC2A0MkeEXleJ", "instantiation": "true", - "name": "0.12mm Fine @Elegoo N4 0.4 nozzle", "layer_height": "0.12", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.4 nozzle);0.12mm Fine @Elegoo Neptune4 (0.4 nozzle)" + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Max 0.4 nozzle.json index afd2451e06..2eadf5cd0c 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Max 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", + "name": "0.12mm Fine @Elegoo N4Max 0.4 nozzle", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.4 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", + "from": "system", "setting_id": "YJTSqtPEGZDih9XE", "instantiation": "true", - "name": "0.12mm Fine @Elegoo N4Max 0.4 nozzle", "layer_height": "0.12", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.4 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.4 nozzle)" + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Plus 0.4 nozzle.json index f69751563e..d2294ac9a0 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", + "name": "0.12mm Fine @Elegoo N4Plus 0.4 nozzle", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.4 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", + "from": "system", "setting_id": "9BipQyur4imL8jml", "instantiation": "true", - "name": "0.12mm Fine @Elegoo N4Plus 0.4 nozzle", "layer_height": "0.12", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.4 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.4 nozzle)" + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Pro 0.4 nozzle.json index 500ba47b84..c73263f6ff 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.12mm Fine @Elegoo N4Pro 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", + "name": "0.12mm Fine @Elegoo N4Pro 0.4 nozzle", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.4 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", + "from": "system", "setting_id": "iN9aVhyxLhUdhDdG", "instantiation": "true", - "name": "0.12mm Fine @Elegoo N4Pro 0.4 nozzle", "layer_height": "0.12", - "wall_loops": "3", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.4 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.4 nozzle)" + "wall_loops": "3" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4 0.4 nozzle.json index 819552c612..5c44b2ae5a 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.16mm Optimal @Elegoo N4 0.4 nozzle", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4 (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", + "from": "system", "setting_id": "Cbq6b2Enl5dz7R61", "instantiation": "true", - "name": "0.16mm Optimal @Elegoo N4 0.4 nozzle", - "layer_height": "0.16", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4 (0.4 nozzle)" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Max 0.4 nozzle.json index 05ad8379a9..e7283fb678 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.16mm Optimal @Elegoo N4Max 0.4 nozzle", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4Max (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", + "from": "system", "setting_id": "StpHJelrwAxTFcwx", "instantiation": "true", - "name": "0.16mm Optimal @Elegoo N4Max 0.4 nozzle", - "layer_height": "0.16", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4Max (0.4 nozzle)" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Plus 0.4 nozzle.json index b7e0e6bcb0..f1821e5c43 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.16mm Optimal @Elegoo N4Plus 0.4 nozzle", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4 Plus (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", + "from": "system", "setting_id": "rldSbNbKZcfEVZqR", "instantiation": "true", - "name": "0.16mm Optimal @Elegoo N4Plus 0.4 nozzle", - "layer_height": "0.16", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4 Plus (0.4 nozzle)" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Pro 0.4 nozzle.json index fe95ed6e04..a710a00b74 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.16mm Optimal @Elegoo N4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.16mm Optimal @Elegoo N4Pro 0.4 nozzle", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4Pro (0.4 nozzle)", "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", + "from": "system", "setting_id": "SNO9sWlpg5QylF2U", "instantiation": "true", - "name": "0.16mm Optimal @Elegoo N4Pro 0.4 nozzle", - "layer_height": "0.16", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4Pro (0.4 nozzle)" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4 0.4 nozzle.json index 8904a2de16..e1386c5e48 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "KX7Cn4tNCSa1BMpF", "name": "0.20mm Standard @Elegoo N4 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.4 nozzle)", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "KX7Cn4tNCSa1BMpF", "instantiation": "true", "filename_format": "EN4_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "6000", @@ -12,6 +13,5 @@ "min_width_top_surface": "50%", "compatible_printers": [ "Elegoo Neptune 4 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Max 0.4 nozzle.json index 418d9824c0..349f1dab0c 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Max 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "6llMZka0sgQ4w50C", "name": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.4 nozzle)", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "6llMZka0sgQ4w50C", "instantiation": "true", "filename_format": "EN4Max_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "3000", @@ -12,6 +13,5 @@ "min_width_top_surface": "50%", "compatible_printers": [ "Elegoo Neptune 4 Max 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Plus 0.4 nozzle.json index 316a5d8dec..d31b34e6ce 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Plus 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "EWip2jSpsehCzgdG", "name": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.4 nozzle)", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "EWip2jSpsehCzgdG", "instantiation": "true", "filename_format": "EN4Plus_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "5000", @@ -12,6 +13,5 @@ "min_width_top_surface": "50%", "compatible_printers": [ "Elegoo Neptune 4 Plus 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Pro 0.4 nozzle.json index d9d74a5fb0..145afaa989 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Standard @Elegoo N4Pro 0.4 nozzle.json @@ -1,9 +1,10 @@ { "type": "process", - "setting_id": "ev7Dl6VzLoldRKK3", "name": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", - "from": "system", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.4 nozzle)", "inherits": "fdm_process_elegoo_04020", + "from": "system", + "setting_id": "ev7Dl6VzLoldRKK3", "instantiation": "true", "filename_format": "EN4Pro_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "default_acceleration": "6000", @@ -12,6 +13,5 @@ "min_width_top_surface": "50%", "compatible_printers": [ "Elegoo Neptune 4 Pro 0.4 nozzle" - ], - "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.4 nozzle)" + ] } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4 0.4 nozzle.json index 7b3f4c2e64..98cb1470f1 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", "name": "0.20mm Strength @Elegoo N4 0.4 nozzle", - "wall_sequence": "inner-outer-inner wall", + "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", + "from": "system", "setting_id": "WBaSzHgrqKENej4G", "instantiation": "true", + "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Max 0.4 nozzle.json index 54ad422763..f701643d83 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Max 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", "name": "0.20mm Strength @Elegoo N4Max 0.4 nozzle", - "wall_sequence": "inner-outer-inner wall", + "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", + "from": "system", "setting_id": "HaK3rpieMESKs6PY", "instantiation": "true", + "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Plus 0.4 nozzle.json index 831205c4d7..a61ed21ae8 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", "name": "0.20mm Strength @Elegoo N4Plus 0.4 nozzle", - "wall_sequence": "inner-outer-inner wall", + "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", + "from": "system", "setting_id": "ad0UueKfT6sGUn0I", "instantiation": "true", + "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Pro 0.4 nozzle.json index 0d475532a4..71cd7c1b92 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.20mm Strength @Elegoo N4Pro 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", "name": "0.20mm Strength @Elegoo N4Pro 0.4 nozzle", - "wall_sequence": "inner-outer-inner wall", + "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", + "from": "system", "setting_id": "LrBDOuD4h741FItb", "instantiation": "true", + "wall_sequence": "inner-outer-inner wall", "reduce_crossing_wall": "1", "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4 0.4 nozzle.json index e0a2eaabd9..120ee7171f 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", "name": "0.24mm Draft @Elegoo N4 0.4 nozzle", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", + "from": "system", "setting_id": "3bX9fmM7GOKwsWLc", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.4 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Max 0.4 nozzle.json index 7035c986c8..cdc064da5a 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", "name": "0.24mm Draft @Elegoo N4Max 0.4 nozzle", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", + "from": "system", "setting_id": "I5pPHYUqGEV4faQe", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.4 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Plus 0.4 nozzle.json index aec452e1b0..07dbfe2095 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", "name": "0.24mm Draft @Elegoo N4Plus 0.4 nozzle", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", + "from": "system", "setting_id": "TUwtXktoDMUFiUjH", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.4 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Pro 0.4 nozzle.json index 20acd0a27c..8cd1ca3d67 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Draft @Elegoo N4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", "name": "0.24mm Draft @Elegoo N4Pro 0.4 nozzle", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", + "from": "system", "setting_id": "JSPwiPfUUfrEmRLx", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.4 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4 0.8 nozzle.json index d093eeaf65..b073c67b8d 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N4 0.8 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.8 nozzle);0.12mm Fine @Elegoo Neptune4 (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4 0.8 nozzle", + "from": "system", "setting_id": "HUtKrGQKYKgX2DSp", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.8 nozzle);0.12mm Fine @Elegoo Neptune4 (0.8 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Max 0.8 nozzle.json index 493fd9ff9a..6c1b56167e 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Max 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N4Max 0.8 nozzle", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.8 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.8 nozzle)", + "inherits": "0.40mm Standard @Elegoo N4Max 0.8 nozzle", "from": "system", "setting_id": "8eKtU9RlWvWk8MfS", "instantiation": "true", - "inherits": "0.40mm Standard @Elegoo N4Max 0.8 nozzle", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.8 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.8 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Plus 0.8 nozzle.json index 6bdaeb44c2..697eac529b 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Plus 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N4Plus 0.8 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.8 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Plus 0.8 nozzle", + "from": "system", "setting_id": "hRKqKq27wVaeLAPG", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.8 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.8 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Pro 0.8 nozzle.json index 2449ed7c4b..4431caf445 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Fine @Elegoo N4Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Fine @Elegoo N4Pro 0.8 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.8 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Pro 0.8 nozzle", + "from": "system", "setting_id": "OcNAeI4a7QtbFJ6W", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.8 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.8 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4 0.6 nozzle.json index ff72b55af4..be2bedfb89 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N4 0.6 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.6 nozzle);0.12mm Fine @Elegoo Neptune4 (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4 (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4 0.6 nozzle", + "from": "system", "setting_id": "EX3MNVdWZSogtuND", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 (0.6 nozzle);0.12mm Fine @Elegoo Neptune4 (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4 (0.6 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Max 0.6 nozzle.json index e54636a0b6..6b4eae42dc 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Max 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N4Max 0.6 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.6 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4Max (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Max 0.6 nozzle", + "from": "system", "setting_id": "KvtJF6N8LWqwgBJu", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Max (0.6 nozzle);0.12mm Fine @Elegoo Neptune4Max (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4Max (0.6 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Plus 0.6 nozzle.json index fcbc9a9066..47582bb842 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Plus 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N4Plus 0.6 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.6 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4 Plus (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Plus 0.6 nozzle", + "from": "system", "setting_id": "vVYW2JeI230MxnFV", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4 Plus (0.6 nozzle);0.12mm Fine @Elegoo Neptune4 Plus (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4 Plus (0.6 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Pro 0.6 nozzle.json index 9f225d96f5..da502a172d 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.24mm Optimal @Elegoo N4Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.24mm Optimal @Elegoo N4Pro 0.6 nozzle", - "from": "system", + "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.6 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4Pro (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Pro 0.6 nozzle", + "from": "system", "setting_id": "3mpKq49ZsvU2jr1J", "instantiation": "true", - "layer_height": "0.24", - "renamed_from": "0.08mm Extra Fine @Elegoo Neptune4Pro (0.6 nozzle);0.12mm Fine @Elegoo Neptune4Pro (0.6 nozzle);0.16mm Optimal @Elegoo Neptune4Pro (0.6 nozzle)" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4 0.4 nozzle.json index 3495255fee..00031f343e 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N4 0.4 nozzle", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4 0.4 nozzle", + "from": "system", "setting_id": "d1EZu3O7DCEtvUo9", "instantiation": "true", - "layer_height": "0.28", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 (0.4 nozzle)" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Max 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Max 0.4 nozzle.json index 316c9f9376..8af768caee 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Max 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N4Max 0.4 nozzle", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Max (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Max 0.4 nozzle", + "from": "system", "setting_id": "uBXPR8bbDu4tnfZ7", "instantiation": "true", - "layer_height": "0.28", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Max (0.4 nozzle)" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Plus 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Plus 0.4 nozzle.json index 195d30d125..4475997940 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N4Plus 0.4 nozzle", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 Plus (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Plus 0.4 nozzle", + "from": "system", "setting_id": "McXTTMnfUYmOZHcI", "instantiation": "true", - "layer_height": "0.28", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 Plus (0.4 nozzle)" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Pro 0.4 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Pro 0.4 nozzle.json index 98e5594b4c..be50ba0bb3 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.28mm Extra Draft @Elegoo N4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", "name": "0.28mm Extra Draft @Elegoo N4Pro 0.4 nozzle", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Pro (0.4 nozzle)", + "inherits": "0.20mm Standard @Elegoo N4Pro 0.4 nozzle", + "from": "system", "setting_id": "qIl89vLzpnjOmZMG", "instantiation": "true", - "layer_height": "0.28", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Pro (0.4 nozzle)" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4 1.0 nozzle.json index f159ca8b8e..5f287a1ed6 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N4 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4 1.0 nozzle", + "from": "system", "setting_id": "LSxHoq8lDbiY0WwD", "instantiation": "true", "layer_height": "0.3" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Max 1.0 nozzle.json index 4dda55dcb9..c28369ad54 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Max 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N4Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Max 1.0 nozzle", + "from": "system", "setting_id": "Usm5LQIdEG5qte0Z", "instantiation": "true", "layer_height": "0.3" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Plus 1.0 nozzle.json index 57db88d6c0..f14bbdd458 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Plus 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N4Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Plus 1.0 nozzle", + "from": "system", "setting_id": "sSKLKqIlQsgkvBoj", "instantiation": "true", "layer_height": "0.3" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Pro 1.0 nozzle.json index 3b9ca2ba34..57661ac6a8 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Fine @Elegoo N4Pro 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.30mm Fine @Elegoo N4Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Pro 1.0 nozzle", + "from": "system", "setting_id": "Fs44Eg0QxZTwNB4i", "instantiation": "true", "layer_height": "0.3" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4 0.6 nozzle.json index 4b0d1d7041..92858aedd6 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Standard @Elegoo N4 0.6 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.6 nozzle)", "inherits": "fdm_process_elegoo_06030", "from": "system", "setting_id": "X0otPkxfrqhtmKyX", @@ -11,6 +12,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.6 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Max 0.6 nozzle.json index 9f10ee23f4..f8efc3ca05 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Max 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Standard @Elegoo N4Max 0.6 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.6 nozzle)", "inherits": "fdm_process_elegoo_06030", "from": "system", "setting_id": "Vy5RnlR6iFs2Uo4Z", @@ -11,6 +12,5 @@ ], "default_acceleration": "3000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "1500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.6 nozzle)" + "outer_wall_acceleration": "1500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Plus 0.6 nozzle.json index 653de53108..cea5c991e9 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Plus 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Standard @Elegoo N4Plus 0.6 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.6 nozzle)", "inherits": "fdm_process_elegoo_06030", "from": "system", "setting_id": "VtWElYWASazfYCCd", @@ -11,6 +12,5 @@ ], "default_acceleration": "5000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "2500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.6 nozzle)" + "outer_wall_acceleration": "2500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Pro 0.6 nozzle.json index 603c81acb4..291c14166b 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.30mm Standard @Elegoo N4Pro 0.6 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30mm Standard @Elegoo N4Pro 0.6 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)", "inherits": "fdm_process_elegoo_06030", "from": "system", "setting_id": "rNfnCbVknDzyGq7a", @@ -11,6 +12,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4 0.8 nozzle.json index 444ca610ff..e5049ab07b 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N4 0.8 nozzle", - "from": "system", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4 (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4 (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4 0.8 nozzle", + "from": "system", "setting_id": "qzrXP9bCuf6aoqg6", "instantiation": "true", - "layer_height": "0.32", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4 (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4 (0.8 nozzle)" + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Max 0.8 nozzle.json index b27212d71a..adfe70dbd2 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Max 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N4Max 0.8 nozzle", - "from": "system", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4Max (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4Max (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Max 0.8 nozzle", + "from": "system", "setting_id": "G3FnBHsN3NV7ZfTR", "instantiation": "true", - "layer_height": "0.32", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4Max (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4Max (0.8 nozzle)" + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Plus 0.8 nozzle.json index ab89009c71..9b6a97a83c 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Plus 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N4Plus 0.8 nozzle", - "from": "system", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4 Plus (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4 Plus (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Plus 0.8 nozzle", + "from": "system", "setting_id": "xbAlLK2WW32kCp3z", "instantiation": "true", - "layer_height": "0.32", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4 Plus (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4 Plus (0.8 nozzle)" + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Pro 0.8 nozzle.json index 2dd5be1fbf..09d0f7ee49 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.32mm Optimal @Elegoo N4Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.32mm Optimal @Elegoo N4Pro 0.8 nozzle", - "from": "system", + "renamed_from": "0.16mm Optimal @Elegoo Neptune4Pro (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4Pro (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Pro 0.8 nozzle", + "from": "system", "setting_id": "KOk0kTX3EelPCG3R", "instantiation": "true", - "layer_height": "0.32", - "renamed_from": "0.16mm Optimal @Elegoo Neptune4Pro (0.8 nozzle);0.28mm Extra Draft @Elegoo Neptune4Pro (0.8 nozzle)" + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4 0.6 nozzle.json index 827c319064..b9c0a86537 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N4 0.6 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4 0.6 nozzle", + "from": "system", "setting_id": "RPUd5w4RMBgxhvgu", "instantiation": "true", - "layer_height": "0.36", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.6 nozzle)" + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Max 0.6 nozzle.json index 1facc52b31..886865680a 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Max 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N4Max 0.6 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Max 0.6 nozzle", + "from": "system", "setting_id": "C9QhIRg3uvqiceM9", "instantiation": "true", - "layer_height": "0.36", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.6 nozzle)" + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Plus 0.6 nozzle.json index 6e05f6655f..f00a560ddd 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Plus 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N4Plus 0.6 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Plus 0.6 nozzle", + "from": "system", "setting_id": "6LT83N9zzhnyndd1", "instantiation": "true", - "layer_height": "0.36", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.6 nozzle)" + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Pro 0.6 nozzle.json index 7380250779..7d981cc1b5 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.36mm Draft @Elegoo N4Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.36mm Draft @Elegoo N4Pro 0.6 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Pro 0.6 nozzle", + "from": "system", "setting_id": "uV8fOfHicJZXuBrG", "instantiation": "true", - "layer_height": "0.36", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.6 nozzle)" + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4 1.0 nozzle.json index e1c9dc2ebf..41062da83d 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N4 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4 1.0 nozzle", + "from": "system", "setting_id": "knCmCemB0pCsXI9H", "instantiation": "true", "layer_height": "0.4" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Max 1.0 nozzle.json index 2db783f9c1..7184631de3 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Max 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N4Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Max 1.0 nozzle", + "from": "system", "setting_id": "O0MSBh9OeaZDP7ow", "instantiation": "true", "layer_height": "0.4" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Plus 1.0 nozzle.json index f5abebabbb..6e57163463 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Plus 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N4Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Plus 1.0 nozzle", + "from": "system", "setting_id": "rxq0eIQKDme3F1Es", "instantiation": "true", "layer_height": "0.4" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Pro 1.0 nozzle.json index 56bc5cd096..0798fc7630 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Optimal @Elegoo N4Pro 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.40mm Optimal @Elegoo N4Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Pro 1.0 nozzle", + "from": "system", "setting_id": "tc7tn1h9Sf3B0D0X", "instantiation": "true", "layer_height": "0.4" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4 0.8 nozzle.json index a07bccbda1..c4440bf396 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Standard @Elegoo N4 0.8 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.8 nozzle)", "inherits": "fdm_process_elegoo_08040", "from": "system", "setting_id": "VnE7I5kpYjaWE9TQ", @@ -11,6 +12,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 (0.8 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Max 0.8 nozzle.json index c3fd42ae08..3c398e5473 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Max 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Standard @Elegoo N4Max 0.8 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.8 nozzle)", "inherits": "fdm_process_elegoo_08040", "from": "system", "setting_id": "tgLcMBDWsMF48oRZ", @@ -11,6 +12,5 @@ ], "default_acceleration": "3000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "1500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Max (0.8 nozzle)" + "outer_wall_acceleration": "1500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Plus 0.8 nozzle.json index 768d30d0a1..45b9a3bb84 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Plus 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Standard @Elegoo N4Plus 0.8 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.8 nozzle)", "inherits": "fdm_process_elegoo_08040", "from": "system", "setting_id": "9o2i5h6e4I7l7QOg", @@ -11,6 +12,5 @@ ], "default_acceleration": "5000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "2500", - "renamed_from": "0.20mm Standard @Elegoo Neptune4 Plus (0.8 nozzle)" + "outer_wall_acceleration": "2500" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Pro 0.8 nozzle.json index 5cd78291fc..c9c2761c65 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.40mm Standard @Elegoo N4Pro 0.8 nozzle.json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40mm Standard @Elegoo N4Pro 0.8 nozzle", + "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)", "inherits": "fdm_process_elegoo_08040", "from": "system", "setting_id": "xFnwaHCJymLM4Bgb", @@ -11,6 +12,5 @@ ], "default_acceleration": "6000", "min_width_top_surface": "50%", - "outer_wall_acceleration": "5000", - "renamed_from": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)" + "outer_wall_acceleration": "5000" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4 0.6 nozzle.json index 1c43c12f8b..2461ad12a5 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N4 0.6 nozzle", - "from": "system", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4 0.6 nozzle", + "from": "system", "setting_id": "XlLhnDcy7S6BcaFE", "instantiation": "true", - "layer_height": "0.42", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 (0.6 nozzle)" + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Max 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Max 0.6 nozzle.json index f6d276ebb6..c5c1cfbbe2 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Max 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N4Max 0.6 nozzle", - "from": "system", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Max (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Max 0.6 nozzle", + "from": "system", "setting_id": "oPxKL0bgR2gX0Ijh", "instantiation": "true", - "layer_height": "0.42", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Max (0.6 nozzle)" + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Plus 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Plus 0.6 nozzle.json index 7def2341c6..0a90e61896 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Plus 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N4Plus 0.6 nozzle", - "from": "system", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 Plus (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Plus 0.6 nozzle", + "from": "system", "setting_id": "qY9HPvv16AZMQj4O", "instantiation": "true", - "layer_height": "0.42", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4 Plus (0.6 nozzle)" + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Pro 0.6 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Pro 0.6 nozzle.json index d060f49384..bff2a4b016 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Pro 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.42mm Extra Draft @Elegoo N4Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.42mm Extra Draft @Elegoo N4Pro 0.6 nozzle", - "from": "system", + "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Pro (0.6 nozzle)", "inherits": "0.30mm Standard @Elegoo N4Pro 0.6 nozzle", + "from": "system", "setting_id": "o1GuCAN5AF2cjFRZ", "instantiation": "true", - "layer_height": "0.42", - "renamed_from": "0.28mm Extra Draft @Elegoo Neptune4Pro (0.6 nozzle)" + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4 0.8 nozzle.json index 41feffa308..8e9e970cb2 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N4 0.8 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4 0.8 nozzle", + "from": "system", "setting_id": "SBUBC3tTWEsoUDwB", "instantiation": "true", - "layer_height": "0.48", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 (0.8 nozzle)" + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Max 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Max 0.8 nozzle.json index e0a4de6b6a..05c2713f77 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Max 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N4Max 0.8 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Max 0.8 nozzle", + "from": "system", "setting_id": "O8HQgyqJNT6oHFL1", "instantiation": "true", - "layer_height": "0.48", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Max (0.8 nozzle)" + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Plus 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Plus 0.8 nozzle.json index f6f5655f0d..dcd7156e56 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Plus 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N4Plus 0.8 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Plus 0.8 nozzle", + "from": "system", "setting_id": "DSXwIJeZIaTQNJdD", "instantiation": "true", - "layer_height": "0.48", - "renamed_from": "0.24mm Draft @Elegoo Neptune4 Plus (0.8 nozzle)" + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Pro 0.8 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Pro 0.8 nozzle.json index 796fc78212..fcc66b3900 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Pro 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.48mm Draft @Elegoo N4Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", "name": "0.48mm Draft @Elegoo N4Pro 0.8 nozzle", - "from": "system", + "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.8 nozzle)", "inherits": "0.40mm Standard @Elegoo N4Pro 0.8 nozzle", + "from": "system", "setting_id": "GYMUhWOFDMRwYdxY", "instantiation": "true", - "layer_height": "0.48", - "renamed_from": "0.24mm Draft @Elegoo Neptune4Pro (0.8 nozzle)" + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4 1.0 nozzle.json index 6da75b45b4..83291412e3 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N4 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4 1.0 nozzle", + "from": "system", "setting_id": "Y8DwHQxs3j9DEU2v", "instantiation": "true", "layer_height": "0.6" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Max 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Max 1.0 nozzle.json index c713999503..cbf3c2e5c3 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Max 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Max 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N4Max 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Max 1.0 nozzle", + "from": "system", "setting_id": "QoV7xebXnXFxPc1G", "instantiation": "true", "layer_height": "0.6" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Plus 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Plus 1.0 nozzle.json index 78e01e0765..e296202055 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Plus 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Plus 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N4Plus 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Plus 1.0 nozzle", + "from": "system", "setting_id": "f5rYjm5HnjXGeRv9", "instantiation": "true", "layer_height": "0.6" diff --git a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Pro 1.0 nozzle.json b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Pro 1.0 nozzle.json index e935f52c72..2de38474da 100644 --- a/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Pro 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EN4SERIES/0.60mm Draft @Elegoo N4Pro 1.0 nozzle.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.60mm Draft @Elegoo N4Pro 1.0 nozzle", - "from": "system", "inherits": "0.50mm Standard @Elegoo N4Pro 1.0 nozzle", + "from": "system", "setting_id": "pjsuqOu6iU4ZDjfL", "instantiation": "true", "layer_height": "0.6" diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json index 965365edd6..b4adafc224 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.16mm Optimal @Elegoo Giga 0.4 nozzle", + "renamed_from": "0.16mm Optimal @EOS Giga 0.4 nozzle", "inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle", - "layer_height": "0.16", + "from": "system", "setting_id": "XLb4AmNTfuDRMWQl", "instantiation": "true", - "renamed_from": "0.16mm Optimal @EOS Giga 0.4 nozzle", - "name": "0.16mm Optimal @Elegoo Giga 0.4 nozzle" + "layer_height": "0.16" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.18mm Fine @Elegoo Giga 0.6 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.18mm Fine @Elegoo Giga 0.6 nozzle.json index f82182d302..76e69eb5a9 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.18mm Fine @Elegoo Giga 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.18mm Fine @Elegoo Giga 0.6 nozzle.json @@ -1,12 +1,12 @@ { "type": "process", - "from": "system", + "name": "0.18mm Fine @Elegoo Giga 0.6 nozzle", + "renamed_from": "0.18mm Fine @EOS Giga 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", - "layer_height": "0.18", + "from": "system", "setting_id": "xxVHp48sijSkmOCr", "instantiation": "true", - "renamed_from": "0.18mm Fine @EOS Giga 0.6 nozzle", - "name": "0.18mm Fine @Elegoo Giga 0.6 nozzle", + "layer_height": "0.18", "compatible_printers": [ "Elegoo OrangeStorm Giga 0.6 nozzle" ] diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Standard @Elegoo Giga 0.4 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Standard @Elegoo Giga 0.4 nozzle.json index 1dc016e684..bca4437c89 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Standard @Elegoo Giga 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Standard @Elegoo Giga 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", "name": "0.20mm Standard @Elegoo Giga 0.4 nozzle", + "renamed_from": "0.20mm Standard @EOS Giga 0.4 nozzle", "inherits": "fdm_process_elegoo_04020", "from": "system", "setting_id": "GIglVjgVd5bAy2nW", "instantiation": "true", - "renamed_from": "0.20mm Standard @EOS Giga 0.4 nozzle", "default_acceleration": "3000", "filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Strength @Elegoo Giga 0.4 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Strength @Elegoo Giga 0.4 nozzle.json index 432e7b60d2..dc25639b17 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Strength @Elegoo Giga 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.20mm Strength @Elegoo Giga 0.4 nozzle.json @@ -1,12 +1,12 @@ { "type": "process", - "from": "system", - "inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle", "name": "0.20mm Strength @Elegoo Giga 0.4 nozzle", - "wall_sequence": "inner-outer-inner wall", - "reduce_crossing_wall": "1", + "renamed_from": "0.20mm Strength @EOS Giga 0.4 nozzle", + "inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle", + "from": "system", "setting_id": "JsDp89yLYQpZ8a9z", "instantiation": "true", - "renamed_from": "0.20mm Strength @EOS Giga 0.4 nozzle", + "wall_sequence": "inner-outer-inner wall", + "reduce_crossing_wall": "1", "wall_loops": "6" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Draft @Elegoo Giga 0.4 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Draft @Elegoo Giga 0.4 nozzle.json index c7df41ccde..5b76b8e465 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Draft @Elegoo Giga 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Draft @Elegoo Giga 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.24mm Draft @Elegoo Giga 0.4 nozzle", + "renamed_from": "0.24mm Draft @EOS Giga 0.4 nozzle", "inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "V1FtH3wGlPhP8SlR", "instantiation": "true", - "renamed_from": "0.24mm Draft @EOS Giga 0.4 nozzle", - "name": "0.24mm Draft @Elegoo Giga 0.4 nozzle" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Fine @Elegoo Giga 0.8 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Fine @Elegoo Giga 0.8 nozzle.json index 3c61774ab9..e1f16f497c 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Fine @Elegoo Giga 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Fine @Elegoo Giga 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.24mm Fine @Elegoo Giga 0.8 nozzle", + "renamed_from": "0.24mm Fine @EOS Giga 0.8 nozzle", "inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "v4n8azbYxr3XfTC1", "instantiation": "true", - "renamed_from": "0.24mm Fine @EOS Giga 0.8 nozzle", - "name": "0.24mm Fine @Elegoo Giga 0.8 nozzle" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json index 5c9783aca0..72b80ea0ab 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.24mm Optimal @Elegoo Giga 0.6 nozzle", + "renamed_from": "0.24mm Optimal @EOS Giga 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", - "layer_height": "0.24", + "from": "system", "setting_id": "ZvTBY1VByXi0woy8", "instantiation": "true", - "renamed_from": "0.24mm Optimal @EOS Giga 0.6 nozzle", - "name": "0.24mm Optimal @Elegoo Giga 0.6 nozzle" + "layer_height": "0.24" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json index cfb1f6173b..afecee96d4 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.28mm Extra Draft @Elegoo Giga 0.4 nozzle", + "renamed_from": "0.28mm Extra Draft @EOS Giga 0.4 nozzle", "inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle", - "layer_height": "0.28", + "from": "system", "setting_id": "fJFavkWAsAtwN4W2", "instantiation": "true", - "renamed_from": "0.28mm Extra Draft @EOS Giga 0.4 nozzle", - "name": "0.28mm Extra Draft @Elegoo Giga 0.4 nozzle" + "layer_height": "0.28" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Fine @Elegoo Giga 1.0 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Fine @Elegoo Giga 1.0 nozzle.json index 0d57c5f756..cf0bb205e7 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Fine @Elegoo Giga 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Fine @Elegoo Giga 1.0 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.30mm Fine @Elegoo Giga 1.0 nozzle", + "renamed_from": "0.30mm Fine @EOS Giga 1.0 nozzle", "inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle", - "layer_height": "0.3", + "from": "system", "setting_id": "fmE4BaIielLYEpAm", "instantiation": "true", - "renamed_from": "0.30mm Fine @EOS Giga 1.0 nozzle", - "name": "0.30mm Fine @Elegoo Giga 1.0 nozzle" + "layer_height": "0.3" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Strength @Elegoo Giga 0.6 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Strength @Elegoo Giga 0.6 nozzle.json index ce791916ca..46edb7aefa 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Strength @Elegoo Giga 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.30mm Strength @Elegoo Giga 0.6 nozzle.json @@ -1,12 +1,12 @@ { "type": "process", - "from": "system", - "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", "name": "0.30mm Strength @Elegoo Giga 0.6 nozzle", - "wall_sequence": "inner-outer-inner wall", - "reduce_crossing_wall": "1", + "renamed_from": "0.30mm Strength @EOS Giga 0.6 nozzle", + "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", + "from": "system", "setting_id": "Vwty88kyYO8bPt9l", "instantiation": "true", - "renamed_from": "0.30mm Strength @EOS Giga 0.6 nozzle", + "wall_sequence": "inner-outer-inner wall", + "reduce_crossing_wall": "1", "wall_loops": "5" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json index c859de87a7..be8908ca94 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.32mm Optimal @Elegoo Giga 0.8 nozzle", + "renamed_from": "0.32mm Optimal @EOS Giga 0.8 nozzle", "inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle", - "layer_height": "0.32", + "from": "system", "setting_id": "U6XpRv8LUHeLMpO6", "instantiation": "true", - "renamed_from": "0.32mm Optimal @EOS Giga 0.8 nozzle", - "name": "0.32mm Optimal @Elegoo Giga 0.8 nozzle" + "layer_height": "0.32" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.36mm Draft @Elegoo Giga 0.6 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.36mm Draft @Elegoo Giga 0.6 nozzle.json index fa032fc410..f8f348841e 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.36mm Draft @Elegoo Giga 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.36mm Draft @Elegoo Giga 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.36mm Draft @Elegoo Giga 0.6 nozzle", + "renamed_from": "0.36mm Draft @EOS Giga 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", - "layer_height": "0.36", + "from": "system", "setting_id": "aFZ4bLGGhFIcwoH5", "instantiation": "true", - "renamed_from": "0.36mm Draft @EOS Giga 0.6 nozzle", - "name": "0.36mm Draft @Elegoo Giga 0.6 nozzle" + "layer_height": "0.36" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json index aa8af94e85..48ffeb9d06 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.40mm Optimal @Elegoo Giga 1.0 nozzle", + "renamed_from": "0.40mm Optimal @EOS Giga 1.0 nozzle", "inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle", - "layer_height": "0.4", + "from": "system", "setting_id": "fGSfqfyNqMhuqZ8X", "instantiation": "true", - "renamed_from": "0.40mm Optimal @EOS Giga 1.0 nozzle", - "name": "0.40mm Optimal @Elegoo Giga 1.0 nozzle" + "layer_height": "0.4" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Standard @Elegoo Giga 0.8 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Standard @Elegoo Giga 0.8 nozzle.json index 8b73f6b7d1..10e4611bc4 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Standard @Elegoo Giga 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.40mm Standard @Elegoo Giga 0.8 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", "name": "0.40mm Standard @Elegoo Giga 0.8 nozzle", + "renamed_from": "0.40mm Standard @EOS Giga 0.8 nozzle", "inherits": "fdm_process_elegoo_08040", "from": "system", "setting_id": "oiMWJMGC2aW2v4wg", "instantiation": "true", - "renamed_from": "0.40mm Standard @EOS Giga 0.8 nozzle", "default_acceleration": "3000", "filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "initial_layer_acceleration": "1000", diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json index 803606068b..11004b57f4 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.42mm Extra Draft @Elegoo Giga 0.6 nozzle", + "renamed_from": "0.42mm Extra Draft @EOS Giga 0.6 nozzle", "inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle", - "layer_height": "0.42", + "from": "system", "setting_id": "dlzWR8ZIwaJ1tYId", "instantiation": "true", - "renamed_from": "0.42mm Extra Draft @EOS Giga 0.6 nozzle", - "name": "0.42mm Extra Draft @Elegoo Giga 0.6 nozzle" + "layer_height": "0.42" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.48mm Draft @Elegoo Giga 0.8 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.48mm Draft @Elegoo Giga 0.8 nozzle.json index 3c660f5b8e..33163a00f1 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.48mm Draft @Elegoo Giga 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.48mm Draft @Elegoo Giga 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.48mm Draft @Elegoo Giga 0.8 nozzle", + "renamed_from": "0.48mm Draft @EOS Giga 0.8 nozzle", "inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle", - "layer_height": "0.48", + "from": "system", "setting_id": "lqJRn5QLgMp5i2dr", "instantiation": "true", - "renamed_from": "0.48mm Draft @EOS Giga 0.8 nozzle", - "name": "0.48mm Draft @Elegoo Giga 0.8 nozzle" + "layer_height": "0.48" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.50mm Standard @Elegoo Giga 1.0 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.50mm Standard @Elegoo Giga 1.0 nozzle.json index f2ad7bb95a..0252414921 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.50mm Standard @Elegoo Giga 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.50mm Standard @Elegoo Giga 1.0 nozzle.json @@ -1,11 +1,11 @@ { "type": "process", - "inherits": "fdm_process_elegoo_10050", "name": "0.50mm Standard @Elegoo Giga 1.0 nozzle", + "renamed_from": "0.50mm Standard @EOS Giga 1.0 nozzle", + "inherits": "fdm_process_elegoo_10050", "from": "system", "setting_id": "hLPWpsFCvKgbrebl", "instantiation": "true", - "renamed_from": "0.50mm Standard @EOS Giga 1.0 nozzle", "default_acceleration": "3000", "filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode", "initial_layer_acceleration": "1000", diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json index 8104d7423a..9a1b450a86 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "from": "system", - "inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle", - "setting_id": "EC6Dqk8dUIai51E5", - "instantiation": "true", + "name": "0.56mm Extra Draft @Elegoo Giga 0.8 nozzle", "renamed_from": "0.56mm Extra Draft @EOS Giga 0.8 nozzle", - "name": "0.56mm Extra Draft @Elegoo Giga 0.8 nozzle" + "inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle", + "from": "system", + "setting_id": "EC6Dqk8dUIai51E5", + "instantiation": "true" } diff --git a/resources/profiles/Elegoo/process/EOSGIGA/0.60mm Draft @Elegoo Giga 1.0 nozzle.json b/resources/profiles/Elegoo/process/EOSGIGA/0.60mm Draft @Elegoo Giga 1.0 nozzle.json index d53af64b0e..664dbdddea 100644 --- a/resources/profiles/Elegoo/process/EOSGIGA/0.60mm Draft @Elegoo Giga 1.0 nozzle.json +++ b/resources/profiles/Elegoo/process/EOSGIGA/0.60mm Draft @Elegoo Giga 1.0 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "from": "system", + "name": "0.60mm Draft @Elegoo Giga 1.0 nozzle", + "renamed_from": "0.60mm Draft @EOS Giga 1.0 nozzle", "inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle", - "layer_height": "0.6", + "from": "system", "setting_id": "VsOntugsCeEPNBvC", "instantiation": "true", - "renamed_from": "0.60mm Draft @EOS Giga 1.0 nozzle", - "name": "0.60mm Draft @Elegoo Giga 1.0 nozzle" + "layer_height": "0.6" } diff --git a/resources/profiles/Eryone.json b/resources/profiles/Eryone.json index ea9ce20a44..3a222c5404 100644 --- a/resources/profiles/Eryone.json +++ b/resources/profiles/Eryone.json @@ -1,6 +1,6 @@ { "name": "Eryone", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "Eryone configurations", "machine_model_list": [ diff --git a/resources/profiles/Eryone/filament/Eryone ABS @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone ABS @0.2 nozzle.json index 11bd3c3c67..c178314b73 100644 --- a/resources/profiles/Eryone/filament/Eryone ABS @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone ABS @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone ABS @0.2 nozzle", + "inherits": "Eryone ABS", "from": "system", "setting_id": "sNet9szMIhVY4WoS", "instantiation": "true", - "inherits": "Eryone ABS", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone ABS-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone ABS-CF @0.2 nozzle.json index 0d862c72f6..c64db14844 100644 --- a/resources/profiles/Eryone/filament/Eryone ABS-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone ABS-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone ABS-CF @0.2 nozzle", + "inherits": "Eryone ABS-CF", "from": "system", "setting_id": "a7qk6VtkbJziQHZo", "instantiation": "true", - "inherits": "Eryone ABS-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone ASA @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone ASA @0.2 nozzle.json index fd8a747c60..090804de80 100644 --- a/resources/profiles/Eryone/filament/Eryone ASA @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone ASA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone ASA @0.2 nozzle", + "inherits": "Eryone ASA", "from": "system", "setting_id": "SopkMvsT3DXzJ9Ky", "instantiation": "true", - "inherits": "Eryone ASA", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone ASA-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone ASA-CF @0.2 nozzle.json index 3e38a60b4f..a89631b5e0 100644 --- a/resources/profiles/Eryone/filament/Eryone ASA-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone ASA-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone ASA-CF @0.2 nozzle", + "inherits": "Eryone ASA-CF", "from": "system", "setting_id": "yBYSvDH0djt4S123", "instantiation": "true", - "inherits": "Eryone ASA-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PA @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PA @0.2 nozzle.json index f8ee131756..36af337c35 100644 --- a/resources/profiles/Eryone/filament/Eryone PA @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PA @0.2 nozzle", + "inherits": "Eryone PA", "from": "system", "setting_id": "zavqdFwS2fsajkps", "instantiation": "true", - "inherits": "Eryone PA", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PA-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PA-CF @0.2 nozzle.json index bb0b1ecba2..006ac2d6d7 100644 --- a/resources/profiles/Eryone/filament/Eryone PA-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PA-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PA-CF @0.2 nozzle", + "inherits": "Eryone PA-CF", "from": "system", "setting_id": "wbnmjqeccJS209GO", "instantiation": "true", - "inherits": "Eryone PA-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PA-GF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PA-GF @0.2 nozzle.json index 14c8620f6a..d161e2ca89 100644 --- a/resources/profiles/Eryone/filament/Eryone PA-GF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PA-GF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PA-GF @0.2 nozzle", + "inherits": "Eryone PA-GF", "from": "system", "setting_id": "J7Oy1mm1szLspwBb", "instantiation": "true", - "inherits": "Eryone PA-GF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PETG @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG @0.2 nozzle.json index e8ddc59440..d3e8c6b1e2 100644 --- a/resources/profiles/Eryone/filament/Eryone PETG @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PETG @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PETG @0.2 nozzle", + "inherits": "Eryone PETG", "from": "system", "setting_id": "cATziDM4CjP6MiC4", "instantiation": "true", - "inherits": "Eryone PETG", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PETG-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG-CF @0.2 nozzle.json index 3bb3f6f1df..84f3ac67a1 100644 --- a/resources/profiles/Eryone/filament/Eryone PETG-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PETG-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PETG-CF @0.2 nozzle", + "inherits": "Eryone PETG-CF", "from": "system", "setting_id": "wsR57UlUrO2aW2Lc", "instantiation": "true", - "inherits": "Eryone PETG-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PLA @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PLA @0.2 nozzle.json index 204bb5e32e..d28cd2146c 100644 --- a/resources/profiles/Eryone/filament/Eryone PLA @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PLA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PLA @0.2 nozzle", + "inherits": "Eryone PLA", "from": "system", "setting_id": "kJhDYIHtXhAd4M6v", "instantiation": "true", - "inherits": "Eryone PLA", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PLA-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PLA-CF @0.2 nozzle.json index 9d43ea33e3..953392e263 100644 --- a/resources/profiles/Eryone/filament/Eryone PLA-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PLA-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PLA-CF @0.2 nozzle", + "inherits": "Eryone PLA-CF", "from": "system", "setting_id": "ghNuMkVp1164Fw1Z", "instantiation": "true", - "inherits": "Eryone PLA-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PP @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PP @0.2 nozzle.json index 47d0b9ec14..f6df74cfe5 100644 --- a/resources/profiles/Eryone/filament/Eryone PP @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PP @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PP @0.2 nozzle", + "inherits": "Eryone PP", "from": "system", "setting_id": "ePXvfc5tmC3GnZPe", "instantiation": "true", - "inherits": "Eryone PP", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone PP-CF @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone PP-CF @0.2 nozzle.json index 986696084e..2b8dab8617 100644 --- a/resources/profiles/Eryone/filament/Eryone PP-CF @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone PP-CF @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone PP-CF @0.2 nozzle", + "inherits": "Eryone PP-CF", "from": "system", "setting_id": "os5ZrNT1utAczy2F", "instantiation": "true", - "inherits": "Eryone PP-CF", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone Silk PLA @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone Silk PLA @0.2 nozzle.json index 1a617e7f14..bfa247ca71 100644 --- a/resources/profiles/Eryone/filament/Eryone Silk PLA @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone Silk PLA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone Silk PLA @0.2 nozzle", + "inherits": "Eryone Silk PLA", "from": "system", "setting_id": "RS6yfcZ6PbJzGrUc", "instantiation": "true", - "inherits": "Eryone Silk PLA", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/filament/Eryone TPU @0.2 nozzle.json b/resources/profiles/Eryone/filament/Eryone TPU @0.2 nozzle.json index 8596a81fb9..2116afac4b 100644 --- a/resources/profiles/Eryone/filament/Eryone TPU @0.2 nozzle.json +++ b/resources/profiles/Eryone/filament/Eryone TPU @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "Eryone TPU @0.2 nozzle", + "inherits": "Eryone TPU", "from": "system", "setting_id": "6Le5wRz6cFfKcPaz", "instantiation": "true", - "inherits": "Eryone TPU", "compatible_printers": [ "Thinker X400 0.2 nozzle" ], diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.2 nozzle.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.2 nozzle.json index 452efb7dba..133e2bd1e1 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.2 nozzle.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.2 nozzle.json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.10mm Standard @Eryone ER20 0.2 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 0.2 nozzle", "inherits": "fdm_machine_eryone_ER20_common", + "from": "system", "setting_id": "mN66BkXzUCaGGkZ5", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.10mm Standard @Eryone ER20 0.2 nozzle", "max_layer_height": [ "0.14" ], "min_layer_height": [ "0.04" ], - "name": "Eryone ER20 0.2 nozzle", "nozzle_diameter": [ "0.2" ], "printer_model": "Eryone ER20", - "printer_variant": "0.2", - "type": "machine" + "printer_variant": "0.2" } diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.4 nozzle.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.4 nozzle.json index c9dd07d94e..b77a7fa400 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.4 nozzle.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.4 nozzle.json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.20mm Standard @Eryone ER20", - "from": "system", + "type": "machine", + "name": "Eryone ER20 0.4 nozzle", "inherits": "fdm_machine_eryone_ER20_common", + "from": "system", "setting_id": "7Hs87Tz3oMj8YGLU", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.20mm Standard @Eryone ER20", "max_layer_height": [ "0.32" ], "min_layer_height": [ "0.08" ], - "name": "Eryone ER20 0.4 nozzle", "nozzle_diameter": [ "0.4" ], "printer_model": "Eryone ER20", - "printer_variant": "0.4", - "type": "machine" + "printer_variant": "0.4" } diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.5 nozzle.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.5 nozzle.json index 6565c58aa8..5ee3558c4d 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.5 nozzle.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.5 nozzle.json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.25mm Standard @Eryone ER20 0.5 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 0.5 nozzle", "inherits": "fdm_machine_eryone_ER20_common", + "from": "system", "setting_id": "8AfjLDQQXEAnxuQ7", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.25mm Standard @Eryone ER20 0.5 nozzle", "max_layer_height": [ "0.38" ], "min_layer_height": [ "0.10" ], - "name": "Eryone ER20 0.5 nozzle", "nozzle_diameter": [ "0.5" ], "printer_model": "Eryone ER20", - "printer_variant": "0.5", - "type": "machine" + "printer_variant": "0.5" } diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.6 nozzle.json index f090d44b6b..7940d962ea 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.6 nozzle.json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.30mm Standard @Eryone ER20 0.6 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 0.6 nozzle", "inherits": "fdm_machine_eryone_ER20_common", + "from": "system", "setting_id": "8USSZMCTCDoHK55n", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.30mm Standard @Eryone ER20 0.6 nozzle", "max_layer_height": [ "0.42" ], "min_layer_height": [ "0.12" ], - "name": "Eryone ER20 0.6 nozzle", "nozzle_diameter": [ "0.6" ], "printer_model": "Eryone ER20", - "printer_variant": "0.6", - "type": "machine" + "printer_variant": "0.6" } diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.8 nozzle.json index d64321fabf..1e2ef0d4e4 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20 0.8 nozzle.json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.40mm Standard @Eryone ER20 0.8 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 0.8 nozzle", "inherits": "fdm_machine_eryone_ER20_common", + "from": "system", "setting_id": "JWFQL6GvDRJk46i7", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.40mm Standard @Eryone ER20 0.8 nozzle", "max_layer_height": [ "0.56" ], "min_layer_height": [ "0.16" ], - "name": "Eryone ER20 0.8 nozzle", "nozzle_diameter": [ "0.8" ], "printer_model": "Eryone ER20", - "printer_variant": "0.8", - "type": "machine" + "printer_variant": "0.8" } diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20.json index c555d904dc..f6c3f95c7e 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20.json @@ -1,4 +1,6 @@ { + "type": "machine_model", + "name": "Eryone ER20", "bed_model": "eryone_er20_buildplate_model.stl", "bed_texture": "Eryone ER20_texture.svg", "family": "Eryone", @@ -6,7 +8,5 @@ "machine_tech": "FFF", "model_id": "Eryone ER20", "default_materials": "Generic PLA @System", - "name": "Eryone ER20", - "nozzle_diameter": "0.4;0.2;0.5;0.6;0.8", - "type": "machine_model" + "nozzle_diameter": "0.4;0.2;0.5;0.6;0.8" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.2 nozzle .json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.2 nozzle .json index fe19a23635..901e256a50 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.2 nozzle .json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.2 nozzle .json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.10mm Standard @Eryone ER20 Klipper 0.2 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 Klipper 0.2 nozzle", "inherits": "fdm_machine_eryone_ER20_Klipper_common", + "from": "system", "setting_id": "dUHn8STOXHOXD63f", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.10mm Standard @Eryone ER20 Klipper 0.2 nozzle", "max_layer_height": [ "0.14" ], "min_layer_height": [ "0.04" ], - "name": "Eryone ER20 Klipper 0.2 nozzle", "nozzle_diameter": [ "0.2" ], "printer_model": "Eryone ER20 Klipper", - "printer_variant": "0.2", - "type": "machine" + "printer_variant": "0.2" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.4 nozzle .json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.4 nozzle .json index 5a95f35977..d206af00a6 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.4 nozzle .json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.4 nozzle .json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.20mm Standard @Eryone ER20 Klipper", - "from": "system", + "type": "machine", + "name": "Eryone ER20 Klipper 0.4 nozzle", "inherits": "fdm_machine_eryone_ER20_Klipper_common", + "from": "system", "setting_id": "xp3wEd41u0J6bR65", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.20mm Standard @Eryone ER20 Klipper", "max_layer_height": [ "0.32" ], "min_layer_height": [ "0.08" ], - "name": "Eryone ER20 Klipper 0.4 nozzle", "nozzle_diameter": [ "0.4" ], "printer_model": "Eryone ER20 Klipper", - "printer_variant": "0.4", - "type": "machine" + "printer_variant": "0.4" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.5 nozzle .json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.5 nozzle .json index 1f97d64742..24b4bdcbbb 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.5 nozzle .json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.5 nozzle .json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 Klipper 0.5 nozzle", "inherits": "fdm_machine_eryone_ER20_Klipper_common", + "from": "system", "setting_id": "5zuzTKyILhVSA5J5", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle", "max_layer_height": [ "0.38" ], "min_layer_height": [ "0.10" ], - "name": "Eryone ER20 Klipper 0.5 nozzle", "nozzle_diameter": [ "0.5" ], "printer_model": "Eryone ER20 Klipper", - "printer_variant": "0.5", - "type": "machine" + "printer_variant": "0.5" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.6 nozzle .json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.6 nozzle .json index b9f675ea43..09abdb4adf 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.6 nozzle .json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.6 nozzle .json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 Klipper 0.6 nozzle", "inherits": "fdm_machine_eryone_ER20_Klipper_common", + "from": "system", "setting_id": "LCVtRqmtH6YySurQ", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle", "max_layer_height": [ "0.42" ], "min_layer_height": [ "0.12" ], - "name": "Eryone ER20 Klipper 0.6 nozzle", "nozzle_diameter": [ "0.6" ], "printer_model": "Eryone ER20 Klipper", - "printer_variant": "0.6", - "type": "machine" + "printer_variant": "0.6" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.8 nozzle .json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.8 nozzle .json index 558a442e30..3f09c89052 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.8 nozzle .json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper 0.8 nozzle .json @@ -1,21 +1,21 @@ { - "default_filament_profile": [], - "default_print_profile": "0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle", - "from": "system", + "type": "machine", + "name": "Eryone ER20 Klipper 0.8 nozzle", "inherits": "fdm_machine_eryone_ER20_Klipper_common", + "from": "system", "setting_id": "eMvz9rZXfWxXvuva", "instantiation": "true", + "default_filament_profile": [], + "default_print_profile": "0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle", "max_layer_height": [ "0.56" ], "min_layer_height": [ "0.16" ], - "name": "Eryone ER20 Klipper 0.8 nozzle", "nozzle_diameter": [ "0.8" ], "printer_model": "Eryone ER20 Klipper", - "printer_variant": "0.8", - "type": "machine" + "printer_variant": "0.8" } diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json index 11d48a7859..edf488dfc9 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json @@ -1,4 +1,6 @@ { + "type": "machine_model", + "name": "Eryone ER20 Klipper", "bed_model": "eryone_er20_buildplate_model.stl", "bed_texture": "Eryone ER20_texture.svg", "default_bed_type": "Textured PEI Plate", @@ -7,8 +9,6 @@ "machine_tech": "FFF", "model_id": "Eryone ER20 Klipper", "default_materials": "Generic PLA @System", - "name": "Eryone ER20 Klipper", "nozzle_diameter": "0.4;0.2;0.5;0.6;0.8", - "type": "machine_model", "desciption": "optimized Eryone ER20 Klipper configuration with E3D Hotend, BMG directdrive, printable height limited to 200 because of the directdrive and Z-Sync mod" } diff --git a/resources/profiles/Eryone/machine/Thinker X400 0.2 nozzle.json b/resources/profiles/Eryone/machine/Thinker X400 0.2 nozzle.json index da3983130a..da328b97ec 100644 --- a/resources/profiles/Eryone/machine/Thinker X400 0.2 nozzle.json +++ b/resources/profiles/Eryone/machine/Thinker X400 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "machine", - "from": "system", "name": "Thinker X400 0.2 nozzle", "inherits": "Thinker X400 0.4 nozzle", + "from": "system", "setting_id": "hMvy9QaXQyM7tGke", "instantiation": "true", "printer_model": "Thinker X400", diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.12mm Draft @Eryone ER20 0.2 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.12mm Draft @Eryone ER20 0.2 nozzle.json index f17dc797a8..d811c3cd92 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.12mm Draft @Eryone ER20 0.2 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.12mm Draft @Eryone ER20 0.2 nozzle.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.12mm Draft @Eryone ER20 0.2 nozzle", + "inherits": "fdm_process_ER20_0.12_nozzle_0.2", + "from": "system", + "setting_id": "X5RY5e2qDLLXRw73", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.2 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.12_nozzle_0.2", - "setting_id": "X5RY5e2qDLLXRw73", - "instantiation": "true", - "name": "0.12mm Draft @Eryone ER20 0.2 nozzle", - "sparse_infill_pattern": "gyroid", - "type": "process" + "sparse_infill_pattern": "gyroid" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.14mm Extra Draft @Eryone ER20 0.2 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.14mm Extra Draft @Eryone ER20 0.2 nozzle.json index 7cc56e1902..dda0835710 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.14mm Extra Draft @Eryone ER20 0.2 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.14mm Extra Draft @Eryone ER20 0.2 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.14mm Extra Draft @Eryone ER20 0.2 nozzle", + "inherits": "fdm_process_ER20_0.14_nozzle_0.2", + "from": "system", + "setting_id": "USrHobTi6gZB0qfs", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.2 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.14_nozzle_0.2", - "setting_id": "USrHobTi6gZB0qfs", - "instantiation": "true", - "name": "0.14mm Extra Draft @Eryone ER20 0.2 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.15mm Optimal @Eryone ER20 0.5 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.15mm Optimal @Eryone ER20 0.5 nozzle.json index c552b7ec31..b294de444d 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.15mm Optimal @Eryone ER20 0.5 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.15mm Optimal @Eryone ER20 0.5 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.15mm Optimal @Eryone ER20 0.5 nozzle", + "inherits": "fdm_process_ER20_0.15_nozzle_0.5", + "from": "system", + "setting_id": "oapNf4dk0MGlHc1t", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.5 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.15_nozzle_0.5", - "setting_id": "oapNf4dk0MGlHc1t", - "instantiation": "true", - "name": "0.15mm Optimal @Eryone ER20 0.5 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.18mm Fine @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.18mm Fine @Eryone ER20 0.6 nozzle.json index c7078cfba4..919f30c69d 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.18mm Fine @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.18mm Fine @Eryone ER20 0.6 nozzle.json @@ -1,11 +1,11 @@ { - "compatible_printers": [ - "Eryone ER20 0.6 nozzle" - ], - "from": "system", + "type": "process", + "name": "0.18mm Fine @Eryone ER20 0.6 nozzle", "inherits": "fdm_process_ER20_0.18_nozzle_0.6", + "from": "system", "setting_id": "XnzfgUygXaUCzqsa", "instantiation": "true", - "name": "0.18mm Fine @Eryone ER20 0.6 nozzle", - "type": "process" + "compatible_printers": [ + "Eryone ER20 0.6 nozzle" + ] } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.20mm Standard @Eryone ER20.json b/resources/profiles/Eryone/process/eryone_ER20/0.20mm Standard @Eryone ER20.json index 2e223dab0c..bd50b52efa 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.20mm Standard @Eryone ER20.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.20mm Standard @Eryone ER20.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.20mm Standard @Eryone ER20", + "inherits": "fdm_process_ER20_0.20", + "from": "system", + "setting_id": "TMsKM3bODapym77c", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.4 nozzle" ], - "from": "system", - "inherits": "fdm_process_ER20_0.20", - "setting_id": "TMsKM3bODapym77c", - "instantiation": "true", "layer_height": "0.20", - "name": "0.20mm Standard @Eryone ER20", - "notes": "", - "type": "process" + "notes": "" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.20mm Strength @Eryone ER20.json b/resources/profiles/Eryone/process/eryone_ER20/0.20mm Strength @Eryone ER20.json index 0ce68ee027..ff47769d19 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.20mm Strength @Eryone ER20.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.20mm Strength @Eryone ER20.json @@ -1,14 +1,14 @@ { + "type": "process", + "name": "0.20mm Strength @Eryone ER20", + "inherits": "fdm_process_ER20_0.20", + "from": "system", + "setting_id": "GFfpctaMRI4Nuqk9", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.4 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.20", - "setting_id": "GFfpctaMRI4Nuqk9", - "instantiation": "true", - "name": "0.20mm Strength @Eryone ER20", "sparse_infill_density": "25%", - "type": "process", "wall_loops": "6" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Draft @Eryone ER20.json b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Draft @Eryone ER20.json index 339736d0b1..bb25e98ead 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Draft @Eryone ER20.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Draft @Eryone ER20.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Draft @Eryone ER20", + "inherits": "fdm_process_ER20_0.24", + "from": "system", + "setting_id": "8rfQRPMh82vmdDeb", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.4 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.24", - "setting_id": "8rfQRPMh82vmdDeb", - "instantiation": "true", - "name": "0.24mm Draft @Eryone ER20", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Fine @Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Fine @Eryone ER20 0.8 nozzle.json index 44d7d8e926..e82e27216d 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Fine @Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Fine @Eryone ER20 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Fine @Eryone ER20 0.8 nozzle", + "inherits": "fdm_process_ER20_0.24_nozzle_0.8", + "from": "system", + "setting_id": "0Ham5AnvDEnEzaSY", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.24_nozzle_0.8", - "setting_id": "0Ham5AnvDEnEzaSY", - "instantiation": "true", - "name": "0.24mm Fine @Eryone ER20 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Optimal @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Optimal @Eryone ER20 0.6 nozzle.json index 7fea46be58..fcf464d07a 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.24mm Optimal @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.24mm Optimal @Eryone ER20 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Optimal @Eryone ER20 0.6 nozzle", + "inherits": "fdm_process_ER20_0.24_nozzle_0.6", + "from": "system", + "setting_id": "0CRLvmSKxkmglWRi", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.24_nozzle_0.6", - "setting_id": "0CRLvmSKxkmglWRi", - "instantiation": "true", - "name": "0.24mm Optimal @Eryone ER20 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.25mm Standard @Eryone ER20 0.5 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.25mm Standard @Eryone ER20 0.5 nozzle.json index e1a26f1715..8dbe018f32 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.25mm Standard @Eryone ER20 0.5 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.25mm Standard @Eryone ER20 0.5 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.25mm Standard @Eryone ER20 0.5 nozzle", + "inherits": "fdm_process_ER20_0.25_nozzle_0.5", + "from": "system", + "setting_id": "oEjMrkTjRF6zL46C", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.5 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.25_nozzle_0.5", - "setting_id": "oEjMrkTjRF6zL46C", - "instantiation": "true", - "name": "0.25mm Standard @Eryone ER20 0.5 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.28mm Extra Draft @Eryone ER20.json b/resources/profiles/Eryone/process/eryone_ER20/0.28mm Extra Draft @Eryone ER20.json index 8a63db28a4..0afdb08dbb 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.28mm Extra Draft @Eryone ER20.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.28mm Extra Draft @Eryone ER20.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.28mm Extra Draft @Eryone ER20", + "inherits": "fdm_process_ER20_0.28", + "from": "system", + "setting_id": "oyoecLMFQzjbIfcd", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.4 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.28", - "setting_id": "oyoecLMFQzjbIfcd", - "instantiation": "true", - "name": "0.28mm Extra Draft @Eryone ER20", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.30mm Standard @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.30mm Standard @Eryone ER20 0.6 nozzle.json index f928604605..67288717e1 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.30mm Standard @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.30mm Standard @Eryone ER20 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.30mm Standard @Eryone ER20 0.6 nozzle", + "inherits": "fdm_process_ER20_0.30_nozzle_0.6", + "from": "system", + "setting_id": "jw5QUhazCifzzM6Q", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.30_nozzle_0.6", - "setting_id": "jw5QUhazCifzzM6Q", - "instantiation": "true", - "name": "0.30mm Standard @Eryone ER20 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.30mm Strength @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.30mm Strength @Eryone ER20 0.6 nozzle.json index 42a56dafef..0467be8ba4 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.30mm Strength @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.30mm Strength @Eryone ER20 0.6 nozzle.json @@ -1,14 +1,14 @@ { + "type": "process", + "name": "0.30mm Strength @Eryone ER20 0.6 nozzle", + "inherits": "fdm_process_ER20_0.30_nozzle_0.6", + "from": "system", + "setting_id": "LqOFomJiS10Vbrdp", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.6 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.30_nozzle_0.6", - "setting_id": "LqOFomJiS10Vbrdp", - "instantiation": "true", - "name": "0.30mm Strength @Eryone ER20 0.6 nozzle", "sparse_infill_density": "25%", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.32mm Optimal @Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.32mm Optimal @Eryone ER20 0.8 nozzle.json index 8c1ff89a9c..5171631cfa 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.32mm Optimal @Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.32mm Optimal @Eryone ER20 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.32mm Optimal @Eryone ER20 0.8 nozzle", + "inherits": "fdm_process_ER20_0.32_nozzle_0.8", + "from": "system", + "setting_id": "5lYVYrlEfVVl2n0F", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.32_nozzle_0.8", - "setting_id": "5lYVYrlEfVVl2n0F", - "instantiation": "true", - "name": "0.32mm Optimal @Eryone ER20 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.36mm Draft @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.36mm Draft @Eryone ER20 0.6 nozzle.json index e673f0b293..da668817ab 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.36mm Draft @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.36mm Draft @Eryone ER20 0.6 nozzle.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.36mm Draft @Eryone ER20 0.6 nozzle", + "inherits": "fdm_process_ER20_0.36_nozzle_0.6", + "from": "system", + "setting_id": "vavNueSF5zRpUlTZ", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.6 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.36_nozzle_0.6", - "setting_id": "vavNueSF5zRpUlTZ", - "instantiation": "true", - "name": "0.36mm Draft @Eryone ER20 0.6 nozzle", - "travel_speed": "250", - "type": "process" + "travel_speed": "250" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.40mm Standard @Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.40mm Standard @Eryone ER20 0.8 nozzle.json index 053d009d36..6ee5f62a08 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.40mm Standard @Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.40mm Standard @Eryone ER20 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.40mm Standard @Eryone ER20 0.8 nozzle", + "inherits": "fdm_process_ER20_0.40_nozzle_0.8", + "from": "system", + "setting_id": "TlCbtZYdCRCkpIf6", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.40_nozzle_0.8", - "setting_id": "TlCbtZYdCRCkpIf6", - "instantiation": "true", - "name": "0.40mm Standard @Eryone ER20 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.42mm Extra Draft @Eryone ER20 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.42mm Extra Draft @Eryone ER20 0.6 nozzle.json index b6c8cd4dbb..13bdd2a5fb 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.42mm Extra Draft @Eryone ER20 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.42mm Extra Draft @Eryone ER20 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.42mm Extra Draft @Eryone ER20 0.6 nozzle", + "inherits": "fdm_process_ER20_0.42_nozzle_0.6", + "from": "system", + "setting_id": "q6PozBOTtWU7CMb0", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.42_nozzle_0.6", - "setting_id": "q6PozBOTtWU7CMb0", - "instantiation": "true", - "name": "0.42mm Extra Draft @Eryone ER20 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.48mm Draft @Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.48mm Draft @Eryone ER20 0.8 nozzle.json index b4b2bed4e5..a45b4c05b2 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.48mm Draft @Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.48mm Draft @Eryone ER20 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.48mm Draft @Eryone ER20 0.8 nozzle", + "inherits": "fdm_process_ER20_0.48_nozzle_0.8", + "from": "system", + "setting_id": "O3BhYAmUROrYm64x", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.48_nozzle_0.8", - "setting_id": "O3BhYAmUROrYm64x", - "instantiation": "true", - "name": "0.48mm Draft @Eryone ER20 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/0.56mm Extra Draft @Eryone ER20 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20/0.56mm Extra Draft @Eryone ER20 0.8 nozzle.json index df15e8722f..c500f00896 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/0.56mm Extra Draft @Eryone ER20 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20/0.56mm Extra Draft @Eryone ER20 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.56mm Extra Draft @Eryone ER20 0.8 nozzle", + "inherits": "fdm_process_ER20_0.56_nozzle_0.8", + "from": "system", + "setting_id": "RCycTBzuArwmwrj1", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_0.56_nozzle_0.8", - "setting_id": "RCycTBzuArwmwrj1", - "instantiation": "true", - "name": "0.56mm Extra Draft @Eryone ER20 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.06_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.06_nozzle_0.2.json index aeb0a8babe..25626784f6 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.06_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.06_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.06_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.06", "line_width": "0.22", - "name": "fdm_process_ER20_0.06_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.06", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.06", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.08_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.08_nozzle_0.2.json index 298bae6b03..cba1685f01 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.08_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.08_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.08_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.08", "line_width": "0.22", - "name": "fdm_process_ER20_0.08_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.08", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.08", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.10_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.10_nozzle_0.2.json index e25994edf5..fc5d14a763 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.10_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.10_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.10_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.1", "line_width": "0.22", - "name": "fdm_process_ER20_0.10_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.1", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.1", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12.json index 47dab55b11..2fd68b2f50 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12.json @@ -1,12 +1,13 @@ { + "type": "process", + "name": "fdm_process_ER20_0.12", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", - "instantiation": "false", "layer_height": "0.12", - "name": "fdm_process_ER20_0.12", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", @@ -14,6 +15,5 @@ "support_threshold_angle": "25", "support_top_z_distance": "0.16", "top_shell_layers": "5", - "top_shell_thickness": "0.6", - "type": "process" + "top_shell_thickness": "0.6" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12_nozzle_0.2.json index f365127bd8..a850e4d244 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.12_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.12_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.12", "line_width": "0.22", - "name": "fdm_process_ER20_0.12_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.12", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.12", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.14_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.14_nozzle_0.2.json index 36bddbb8c1..01d0d03b70 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.14_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.14_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.14_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.14", "line_width": "0.22", - "name": "fdm_process_ER20_0.14_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.14", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.14", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.15_nozzle_0.5.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.15_nozzle_0.5.json index c1b87f3c79..1ac3e109d2 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.15_nozzle_0.5.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.15_nozzle_0.5.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_0.15_nozzle_0.5", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", "initial_layer_line_width": "0.52", "inner_wall_line_width": "0.55", - "instantiation": "false", "internal_solid_infill_line_width": "0.55", "ironing_inset": "0.21", "layer_height": "0.15", "line_width": "0.52", - "name": "fdm_process_ER20_0.15_nozzle_0.5", "outer_wall_line_width": "0.52", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", @@ -22,6 +23,5 @@ "support_top_z_distance": "0.15", "top_shell_layers": "6", "top_shell_thickness": "0", - "top_surface_line_width": "0.52", - "type": "process" + "top_surface_line_width": "0.52" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.16.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.16.json index 4ccdbd7f5d..559dd8a177 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.16.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.16.json @@ -1,18 +1,18 @@ { + "type": "process", + "name": "fdm_process_ER20_0.16", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "bottom_shell_layers": "5", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", - "instantiation": "false", "layer_height": "0.16", - "name": "fdm_process_ER20_0.16", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "top_shell_layers": "6", - "top_shell_thickness": "0", - "type": "process" + "top_shell_thickness": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.18_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.18_nozzle_0.6.json index e0898428f9..806ecfd94b 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.18_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.18_nozzle_0.6.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.18_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.18", "line_width": "0.62", - "name": "fdm_process_ER20_0.18_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.20.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.20.json index d19ce1d6b5..db95834983 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.20.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.20.json @@ -1,18 +1,18 @@ { + "type": "process", + "name": "fdm_process_ER20_0.20", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "bottom_shell_layers": "5", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", - "instantiation": "false", "layer_height": "0.20", - "name": "fdm_process_ER20_0.20", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "top_shell_layers": "5", - "top_shell_thickness": "0", - "type": "process" + "top_shell_thickness": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24.json index a7123ed6e4..ea72c8881c 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24.json @@ -1,16 +1,16 @@ { + "type": "process", + "name": "fdm_process_ER20_0.24", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", - "instantiation": "false", "layer_height": "0.24", - "name": "fdm_process_ER20_0.24", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "support_threshold_angle": "35", "top_shell_layers": "5", "top_shell_thickness": "0", - "top_surface_line_width": "0.45", - "type": "process" + "top_surface_line_width": "0.45" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.6.json index 1532096134..86ba72d2f1 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.24_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.24", "line_width": "0.62", - "name": "fdm_process_ER20_0.24_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.8.json index 2a6ffbb9f5..6d6a928541 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.24_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.24_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.24", "line_width": "0.82", - "name": "fdm_process_ER20_0.24_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.25_nozzle_0.5.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.25_nozzle_0.5.json index ecffb4877c..38003a9df9 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.25_nozzle_0.5.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.25_nozzle_0.5.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.25_nozzle_0.5", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.55", "initial_layer_print_height": "0.2", "inner_wall_line_width": "0.55", - "instantiation": "false", "internal_solid_infill_line_width": "0.55", "ironing_inset": "0.21", "layer_height": "0.25", "line_width": "0.55", - "name": "fdm_process_ER20_0.25_nozzle_0.5", "outer_wall_line_width": "0.55", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.55", "support_line_width": "0.55", - "top_surface_line_width": "0.55", - "type": "process" + "top_surface_line_width": "0.55" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.28.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.28.json index d75e311f29..ba913a409f 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.28.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.28.json @@ -1,16 +1,16 @@ { + "type": "process", + "name": "fdm_process_ER20_0.28", + "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_common", - "instantiation": "false", "layer_height": "0.28", - "name": "fdm_process_ER20_0.28", "support_bottom_z_distance": "0.16", "support_threshold_angle": "40", "support_top_z_distance": "0.16", "top_shell_layers": "4", "top_shell_thickness": "0", - "top_surface_line_width": "0.45", - "type": "process" + "top_surface_line_width": "0.45" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.30_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.30_nozzle_0.6.json index 906493c26d..91de6302d0 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.30_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.30_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.30_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.3", "line_width": "0.62", - "name": "fdm_process_ER20_0.30_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.32_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.32_nozzle_0.8.json index 3a41303514..70ba0bd138 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.32_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.32_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.32_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.32", "line_width": "0.82", - "name": "fdm_process_ER20_0.32_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.36_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.36_nozzle_0.6.json index b204326637..b20f77d447 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.36_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.36_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.36_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.36", "line_width": "0.62", - "name": "fdm_process_ER20_0.36_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.40_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.40_nozzle_0.8.json index a12fe0e287..4b96ae9173 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.40_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.40_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.40_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.4", "line_width": "0.82", - "name": "fdm_process_ER20_0.40_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.42_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.42_nozzle_0.6.json index 5663b993b7..25f8762e55 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.42_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.42_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.42_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.42", "line_width": "0.62", - "name": "fdm_process_ER20_0.42_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.48_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.48_nozzle_0.8.json index c5a3bca18c..603758c587 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.48_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.48_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.48_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.48", "line_width": "0.82", - "name": "fdm_process_ER20_0.48_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.56_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.56_nozzle_0.8.json index 28c4e47272..eecb35736f 100644 --- a/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.56_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20/fdm_process_ER20_0.56_nozzle_0.8.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_0.56_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.56", "line_width": "0.82", - "name": "fdm_process_ER20_0.56_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", "top_surface_line_width": "0.82", - "top_surface_pattern": "monotonic", - "type": "process" + "top_surface_pattern": "monotonic" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle.json index 1ea915ac25..bb24e38c8b 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.12_nozzle_0.2", + "from": "system", + "setting_id": "G6ezw9j2ZskBlDcf", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.2 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.12_nozzle_0.2", - "setting_id": "G6ezw9j2ZskBlDcf", - "instantiation": "true", - "name": "0.12mm Draft @Eryone ER20 Klipper 0.2 nozzle", - "sparse_infill_pattern": "gyroid", - "type": "process" + "sparse_infill_pattern": "gyroid" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle.json index 17ddd78449..781bcc50b4 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.14_nozzle_0.2", + "from": "system", + "setting_id": "REb8DrBmb84Jz1RU", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.2 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.14_nozzle_0.2", - "setting_id": "REb8DrBmb84Jz1RU", - "instantiation": "true", - "name": "0.14mm Extra Draft @Eryone ER20 Klipper 0.2 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle.json index dae8d693f8..6839e252df 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.15_nozzle_0.5", + "from": "system", + "setting_id": "bwykEBgiXSoyw8zd", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.5 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.15_nozzle_0.5", - "setting_id": "bwykEBgiXSoyw8zd", - "instantiation": "true", - "name": "0.15mm Optimal @Eryone ER20 Klipper 0.5 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle.json index abba79b691..55b5c999e6 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,11 +1,11 @@ { - "compatible_printers": [ - "Eryone ER20 Klipper 0.6 nozzle" - ], - "from": "system", + "type": "process", + "name": "0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle", "inherits": "fdm_process_ER20_Klipper_0.18_nozzle_0.6", + "from": "system", "setting_id": "4Wh9O5o6h68TEy69", "instantiation": "true", - "name": "0.18mm Fine @Eryone ER20 Klipper 0.6 nozzle", - "type": "process" + "compatible_printers": [ + "Eryone ER20 Klipper 0.6 nozzle" + ] } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Standard @Eryone ER20 Klipper.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Standard @Eryone ER20 Klipper.json index 3208090373..bb42e46c99 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Standard @Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Standard @Eryone ER20 Klipper.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.20mm Standard @Eryone ER20 Klipper", + "inherits": "fdm_process_ER20_Klipper_0.20", + "from": "system", + "setting_id": "08wgu9MP0trL3JBg", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.4 nozzle" ], - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.20", - "setting_id": "08wgu9MP0trL3JBg", - "instantiation": "true", "layer_height": "0.20", - "name": "0.20mm Standard @Eryone ER20 Klipper", - "notes": "", - "type": "process" + "notes": "" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Strength @Eryone ER20 Klipper.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Strength @Eryone ER20 Klipper.json index a0679cda21..b39dcd5503 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Strength @Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.20mm Strength @Eryone ER20 Klipper.json @@ -1,14 +1,14 @@ { + "type": "process", + "name": "0.20mm Strength @Eryone ER20 Klipper", + "inherits": "fdm_process_ER20_Klipper_0.20", + "from": "system", + "setting_id": "7pYaosUUA3Kv13pI", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.4 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.20", - "setting_id": "7pYaosUUA3Kv13pI", - "instantiation": "true", - "name": "0.20mm Strength @Eryone ER20 Klipper", "sparse_infill_density": "25%", - "type": "process", "wall_loops": "6" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Draft @Eryone ER20 Klipper.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Draft @Eryone ER20 Klipper.json index 4a9d3d1a7b..0c33decbda 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Draft @Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Draft @Eryone ER20 Klipper.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Draft @Eryone ER20 Klipper", + "inherits": "fdm_process_ER20_Klipper_0.24", + "from": "system", + "setting_id": "SJzxe1s82yL2Lgrj", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.4 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.24", - "setting_id": "SJzxe1s82yL2Lgrj", - "instantiation": "true", - "name": "0.24mm Draft @Eryone ER20 Klipper", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle.json index 75c49ea75a..b0505f3053 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.24_nozzle_0.8", + "from": "system", + "setting_id": "FaQ9qpjWF28hexB2", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.24_nozzle_0.8", - "setting_id": "FaQ9qpjWF28hexB2", - "instantiation": "true", - "name": "0.24mm Fine @Eryone ER20 Klipper 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle.json index 67c4801673..c6ec9d4d14 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.24_nozzle_0.6", + "from": "system", + "setting_id": "BaYIyJyVUiPXPjMr", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.24_nozzle_0.6", - "setting_id": "BaYIyJyVUiPXPjMr", - "instantiation": "true", - "name": "0.24mm Optimal @Eryone ER20 Klipper 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle.json index 74b798ed80..8c6142132e 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.25_nozzle_0.5", + "from": "system", + "setting_id": "GFnRlK2ceYBvswLe", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.5 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.25_nozzle_0.5", - "setting_id": "GFnRlK2ceYBvswLe", - "instantiation": "true", - "name": "0.25mm Standard @Eryone ER20 Klipper 0.5 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.28mm Extra Draft @Eryone ER20 Klipper.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.28mm Extra Draft @Eryone ER20 Klipper.json index 182198870c..10a767540c 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.28mm Extra Draft @Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.28mm Extra Draft @Eryone ER20 Klipper.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.28mm Extra Draft @Eryone ER20 Klipper", + "inherits": "fdm_process_ER20_Klipper_0.28", + "from": "system", + "setting_id": "q5VO6Fykaq7MeqA3", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.4 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.28", - "setting_id": "q5VO6Fykaq7MeqA3", - "instantiation": "true", - "name": "0.28mm Extra Draft @Eryone ER20 Klipper", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle.json index e89b4e4328..f1b660b67b 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", + "from": "system", + "setting_id": "uteDUtHF4ALpNDE9", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", - "setting_id": "uteDUtHF4ALpNDE9", - "instantiation": "true", - "name": "0.30mm Standard @Eryone ER20 Klipper 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle.json index 948cffdd9e..4c89f50816 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,14 +1,14 @@ { + "type": "process", + "name": "0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", + "from": "system", + "setting_id": "I69wf0KGngqBKs6d", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.6 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", - "setting_id": "I69wf0KGngqBKs6d", - "instantiation": "true", - "name": "0.30mm Strength @Eryone ER20 Klipper 0.6 nozzle", "sparse_infill_density": "25%", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle.json index a4fab18d22..33b0a77c3b 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.32_nozzle_0.8", + "from": "system", + "setting_id": "6ULt0zBZlGeQj0zL", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.32_nozzle_0.8", - "setting_id": "6ULt0zBZlGeQj0zL", - "instantiation": "true", - "name": "0.32mm Optimal @Eryone ER20 Klipper 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle.json index 32a776a3c3..ba2c8d73c5 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,13 +1,13 @@ { + "type": "process", + "name": "0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.36_nozzle_0.6", + "from": "system", + "setting_id": "JLPcqoC2Uib9aRUQ", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.6 nozzle" ], "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.36_nozzle_0.6", - "setting_id": "JLPcqoC2Uib9aRUQ", - "instantiation": "true", - "name": "0.36mm Draft @Eryone ER20 Klipper 0.6 nozzle", - "travel_speed": "250", - "type": "process" + "travel_speed": "250" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle.json index 90db009e2c..8f53d41934 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.40_nozzle_0.8", + "from": "system", + "setting_id": "Rar12YnTox9pGeWw", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.40_nozzle_0.8", - "setting_id": "Rar12YnTox9pGeWw", - "instantiation": "true", - "name": "0.40mm Standard @Eryone ER20 Klipper 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle.json index 2fb538d04a..4eb71e439d 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.42_nozzle_0.6", + "from": "system", + "setting_id": "8XAFm1qhJ5VbrcDt", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.6 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.42_nozzle_0.6", - "setting_id": "8XAFm1qhJ5VbrcDt", - "instantiation": "true", - "name": "0.42mm Extra Draft @Eryone ER20 Klipper 0.6 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle.json index 96a1373759..57d3990944 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.48_nozzle_0.8", + "from": "system", + "setting_id": "PtwzuflLVEwcJU1s", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.48_nozzle_0.8", - "setting_id": "PtwzuflLVEwcJU1s", - "instantiation": "true", - "name": "0.48mm Draft @Eryone ER20 Klipper 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle.json index a76d38d67a..f9dcb4b411 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle.json @@ -1,12 +1,12 @@ { + "type": "process", + "name": "0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle", + "inherits": "fdm_process_ER20_Klipper_0.56_nozzle_0.8", + "from": "system", + "setting_id": "yjLp31EgxsGWg3AY", + "instantiation": "true", "compatible_printers": [ "Eryone ER20 Klipper 0.8 nozzle" ], - "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_ER20_Klipper_0.56_nozzle_0.8", - "setting_id": "yjLp31EgxsGWg3AY", - "instantiation": "true", - "name": "0.56mm Extra Draft @Eryone ER20 Klipper 0.8 nozzle", - "type": "process" + "elefant_foot_compensation": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.06_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.06_nozzle_0.2.json index b7ddf5d471..e10f036503 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.06_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.06_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.06_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.06", "line_width": "0.22", - "name": "fdm_process_ER20_Klipper_0.06_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.06", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.06", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.08_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.08_nozzle_0.2.json index 023831538f..3717b77e01 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.08_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.08_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.08_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.08", "line_width": "0.22", - "name": "fdm_process_ER20_Klipper_0.08_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.08", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.08", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.10_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.10_nozzle_0.2.json index 7595ff7330..d1f2d8a94e 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.10_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.10_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.10_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.1", "line_width": "0.22", - "name": "fdm_process_ER20_Klipper_0.10_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.1", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.1", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12.json index 69ff2af25e..ea4b88c42c 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12.json @@ -1,12 +1,13 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.12", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", - "instantiation": "false", "layer_height": "0.12", - "name": "fdm_process_ER20_Klipper_0.12", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", @@ -14,6 +15,5 @@ "support_threshold_angle": "25", "support_top_z_distance": "0.16", "top_shell_layers": "5", - "top_shell_thickness": "0.6", - "type": "process" + "top_shell_thickness": "0.6" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12_nozzle_0.2.json index b05e4cc430..5193865b34 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.12_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.12_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.12", "line_width": "0.22", - "name": "fdm_process_ER20_Klipper_0.12_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.12", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.12", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.14_nozzle_0.2.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.14_nozzle_0.2.json index 4cb51f3fa3..34399dccb7 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.14_nozzle_0.2.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.14_nozzle_0.2.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.14_nozzle_0.2", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.25", "inner_wall_line_width": "0.22", - "instantiation": "false", "internal_solid_infill_line_width": "0.22", "ironing_inset": "0.11", "layer_height": "0.14", "line_width": "0.22", - "name": "fdm_process_ER20_Klipper_0.14_nozzle_0.2", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", "support_bottom_z_distance": "0.14", @@ -18,6 +19,5 @@ "support_top_z_distance": "0.14", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "type": "process", "wall_loops": "4" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.15_nozzle_0.5.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.15_nozzle_0.5.json index 8b9d0510d6..187eb955f0 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.15_nozzle_0.5.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.15_nozzle_0.5.json @@ -1,16 +1,17 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.15_nozzle_0.5", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bottom_shell_layers": "5", "bridge_flow": "1", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", "initial_layer_line_width": "0.52", "inner_wall_line_width": "0.55", - "instantiation": "false", "internal_solid_infill_line_width": "0.55", "ironing_inset": "0.21", "layer_height": "0.15", "line_width": "0.52", - "name": "fdm_process_ER20_Klipper_0.15_nozzle_0.5", "outer_wall_line_width": "0.52", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", @@ -22,6 +23,5 @@ "support_top_z_distance": "0.15", "top_shell_layers": "6", "top_shell_thickness": "0", - "top_surface_line_width": "0.52", - "type": "process" + "top_surface_line_width": "0.52" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.16.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.16.json index 838270870f..c2a2da9584 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.16.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.16.json @@ -1,18 +1,18 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.16", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "bottom_shell_layers": "5", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", - "instantiation": "false", "layer_height": "0.16", - "name": "fdm_process_ER20_Klipper_0.16", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "top_shell_layers": "6", - "top_shell_thickness": "0", - "type": "process" + "top_shell_thickness": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.18_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.18_nozzle_0.6.json index c43af7a161..637d483e3e 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.18_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.18_nozzle_0.6.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.18_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.18", "line_width": "0.62", - "name": "fdm_process_ER20_Klipper_0.18_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.20.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.20.json index 0a0fbc96ca..4eb554ffa4 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.20.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.20.json @@ -1,18 +1,18 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.20", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "bottom_shell_layers": "5", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", - "instantiation": "false", "layer_height": "0.20", - "name": "fdm_process_ER20_Klipper_0.20", "overhang_1_4_speed": "60", "overhang_2_4_speed": "30", "overhang_3_4_speed": "10", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "top_shell_layers": "5", - "top_shell_thickness": "0", - "type": "process" + "top_shell_thickness": "0" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24.json index d20c74bbf5..16fc9471ef 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24.json @@ -1,16 +1,16 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.24", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", - "instantiation": "false", "layer_height": "0.24", - "name": "fdm_process_ER20_Klipper_0.24", "support_bottom_z_distance": "0.16", "support_top_z_distance": "0.16", "support_threshold_angle": "35", "top_shell_layers": "5", "top_shell_thickness": "0", - "top_surface_line_width": "0.45", - "type": "process" + "top_surface_line_width": "0.45" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.6.json index eb55b212e5..69c93e65b8 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.24_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.24", "line_width": "0.62", - "name": "fdm_process_ER20_Klipper_0.24_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.8.json index bb639fd3db..272bee0193 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.24_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.24_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.24", "line_width": "0.82", - "name": "fdm_process_ER20_Klipper_0.24_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.25_nozzle_0.5.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.25_nozzle_0.5.json index 4de34c25a9..253a74cdbc 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.25_nozzle_0.5.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.25_nozzle_0.5.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.25_nozzle_0.5", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.52", "initial_layer_print_height": "0.2", "inner_wall_line_width": "0.52", - "instantiation": "false", "internal_solid_infill_line_width": "0.52", "ironing_inset": "0.21", "layer_height": "0.25", "line_width": "0.52", - "name": "fdm_process_ER20_Klipper_0.25_nozzle_0.5", "outer_wall_line_width": "0.52", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.52", "support_line_width": "0.52", - "top_surface_line_width": "0.52", - "type": "process" + "top_surface_line_width": "0.52" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.28.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.28.json index a38384ccd6..ea275d2f8a 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.28.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.28.json @@ -1,16 +1,16 @@ { + "type": "process", + "name": "fdm_process_ER20_Klipper_0.28", + "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", "bridge_flow": "1", "elefant_foot_compensation": "0", - "from": "system", - "inherits": "fdm_process_eryone_ER20_Klipper_common", - "instantiation": "false", "layer_height": "0.28", - "name": "fdm_process_ER20_Klipper_0.28", "support_bottom_z_distance": "0.16", "support_threshold_angle": "40", "support_top_z_distance": "0.16", "top_shell_layers": "4", "top_shell_thickness": "0", - "top_surface_line_width": "0.45", - "type": "process" + "top_surface_line_width": "0.45" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.30_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.30_nozzle_0.6.json index d9c7546b71..96353e5a49 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.30_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.30_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.3", "line_width": "0.62", - "name": "fdm_process_ER20_Klipper_0.30_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.32_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.32_nozzle_0.8.json index 926c1d2eb7..a4db98d968 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.32_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.32_nozzle_0.8.json @@ -1,21 +1,21 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.32_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.32", "line_width": "0.82", - "name": "fdm_process_ER20_Klipper_0.32_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "type": "process" + "top_surface_line_width": "0.82" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.36_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.36_nozzle_0.6.json index b460bfc6da..c3342ea896 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.36_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.36_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.36_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.36", "line_width": "0.62", - "name": "fdm_process_ER20_Klipper_0.36_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.40_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.40_nozzle_0.8.json index 0322029ca6..b1af14348b 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.40_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.40_nozzle_0.8.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.40_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.4", "line_width": "0.82", - "name": "fdm_process_ER20_Klipper_0.40_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", "top_surface_line_width": "0.82", - "top_surface_pattern": "monotonic", - "type": "process" + "top_surface_pattern": "monotonic" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.42_nozzle_0.6.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.42_nozzle_0.6.json index 2740014d1b..76d5c254d7 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.42_nozzle_0.6.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.42_nozzle_0.6.json @@ -1,20 +1,20 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.42_nozzle_0.6", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", "inner_wall_line_width": "0.62", - "instantiation": "false", "internal_solid_infill_line_width": "0.62", "ironing_inset": "0.31", "layer_height": "0.42", "line_width": "0.62", - "name": "fdm_process_ER20_Klipper_0.42_nozzle_0.6", "outer_wall_line_width": "0.62", "overhang_3_4_speed": "15", "sparse_infill_line_width": "0.62", "support_line_width": "0.62", - "top_surface_line_width": "0.62", - "type": "process" + "top_surface_line_width": "0.62" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.48_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.48_nozzle_0.8.json index 63391ccad7..32df0df51e 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.48_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.48_nozzle_0.8.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.48_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.48", "line_width": "0.82", - "name": "fdm_process_ER20_Klipper_0.48_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", "top_surface_line_width": "0.82", - "top_surface_pattern": "monotonic", - "type": "process" + "top_surface_pattern": "monotonic" } diff --git a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.56_nozzle_0.8.json b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.56_nozzle_0.8.json index 49c926381d..94a133d6a2 100644 --- a/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.56_nozzle_0.8.json +++ b/resources/profiles/Eryone/process/eryone_ER20_Klipper/fdm_process_ER20_Klipper_0.56_nozzle_0.8.json @@ -1,22 +1,22 @@ { - "bridge_flow": "1", - "from": "system", + "type": "process", + "name": "fdm_process_ER20_Klipper_0.56_nozzle_0.8", "inherits": "fdm_process_eryone_ER20_Klipper_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", "inner_wall_line_width": "0.82", - "instantiation": "false", "internal_solid_infill_line_width": "0.82", "ironing_inset": "0.41", "layer_height": "0.56", "line_width": "0.82", - "name": "fdm_process_ER20_Klipper_0.56_nozzle_0.8", "outer_wall_line_width": "0.82", "overhang_3_4_speed": "25", "overhang_4_4_speed": "5", "sparse_infill_line_width": "0.82", "support_line_width": "0.82", "top_surface_line_width": "0.82", - "top_surface_pattern": "monotonic", - "type": "process" + "top_surface_pattern": "monotonic" } diff --git a/resources/profiles/FLSun.json b/resources/profiles/FLSun.json index 36d0129015..d8d91a09a0 100644 --- a/resources/profiles/FLSun.json +++ b/resources/profiles/FLSun.json @@ -1,6 +1,6 @@ { "name": "FLSun", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "FLSun configurations", "machine_model_list": [ diff --git a/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json index 3a57d47404..07bde5301d 100644 --- a/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @FLSun S1", - "inherits": "Generic ABS @FLSun", "renamed_from": "FLSun S1 ABS", + "inherits": "Generic ABS @FLSun", "from": "system", "setting_id": "a7U3u888FlJ6CSFb", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json index 36c684cdc6..54c0f5457e 100644 --- a/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @FLSun T1", - "inherits": "Generic ABS @FLSun", "renamed_from": "FLSun T1 ABS", + "inherits": "Generic ABS @FLSun", "from": "system", "setting_id": "j185WWfVulPxWJvQ", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic ABS @FLSun.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun.json index 2daf007fe9..ce04f9a073 100644 --- a/resources/profiles/FLSun/filament/Generic ABS @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @FLSun", - "inherits": "fdm_filament_abs", "renamed_from": "FLSun Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "1lPapSrZbKMLBx6k", "filament_id": "OFY9muEs", diff --git a/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json index d605ac5519..e858be9f6c 100644 --- a/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @FLSun S1", - "inherits": "Generic ASA @FLSun", "renamed_from": "FLSun S1 ASA", + "inherits": "Generic ASA @FLSun", "from": "system", "setting_id": "qJeJII6CgHuaC4Iz", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json index c27f9e34dd..e7acf671d9 100644 --- a/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @FLSun T1", - "inherits": "Generic ASA @FLSun", "renamed_from": "FLSun T1 ASA", + "inherits": "Generic ASA @FLSun", "from": "system", "setting_id": "kj4PPnvuvvGDrDwA", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic ASA @FLSun.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun.json index e86f82f441..681f5a381b 100644 --- a/resources/profiles/FLSun/filament/Generic ASA @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @FLSun", - "inherits": "fdm_filament_asa", "renamed_from": "FLSun Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "22OH64Yfg5sdyEmz", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/FLSun/filament/Generic PA @FLSun.json b/resources/profiles/FLSun/filament/Generic PA @FLSun.json index 49fe8c01fc..a47ceea70a 100644 --- a/resources/profiles/FLSun/filament/Generic PA @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PA @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @FLSun", - "inherits": "fdm_filament_pa", "renamed_from": "FLSun Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "hlHGTLqHjaRfMkqC", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json b/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json index b6dc311dcf..370cdb2e6e 100644 --- a/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @FLSun", - "inherits": "fdm_filament_pa", "renamed_from": "FLSun Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "xiLUY07SM81i1pPs", "filament_id": "OFQLcbps", diff --git a/resources/profiles/FLSun/filament/Generic PC @FLSun.json b/resources/profiles/FLSun/filament/Generic PC @FLSun.json index e4d81857d3..74f6bbfa1a 100644 --- a/resources/profiles/FLSun/filament/Generic PC @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PC @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @FLSun", - "inherits": "fdm_filament_pc", "renamed_from": "FLSun Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "Ok08F2LxNjxor6ph", "filament_id": "OFLakOUI", diff --git a/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json index 02506525dd..8af106f03d 100644 --- a/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @FLSun S1", - "inherits": "Generic PETG @FLSun", "renamed_from": "FLSun S1 PETG", + "inherits": "Generic PETG @FLSun", "from": "system", "setting_id": "LxDenrdsmz0QjMDE", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json index 64651bea1d..8a51e86e6b 100644 --- a/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @FLSun T1", - "inherits": "Generic PETG @FLSun", "renamed_from": "FLSun T1 PETG", + "inherits": "Generic PETG @FLSun", "from": "system", "setting_id": "n9wpUe32lTtq2iSS", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic PETG @FLSun.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun.json index 84eaee1c7c..22dbbbf5e7 100644 --- a/resources/profiles/FLSun/filament/Generic PETG @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @FLSun", - "inherits": "fdm_filament_pet", "renamed_from": "FLSun Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "pWuJLjWhYMutD92n", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json index 5674ba8c27..9fa17d0e6b 100644 --- a/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @FLSun S1", - "inherits": "Generic PLA @FLSun", "renamed_from": "FLSun S1 PLA Generic", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "4f9vGTYsHDbZoVjs", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json index 93b9ac08d4..d5a35a8138 100644 --- a/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @FLSun T1", - "inherits": "Generic PLA @FLSun", "renamed_from": "FLSun T1 PLA Generic", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "5aJUZ6r6jtnvck19", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/FLSun/filament/Generic PLA @FLSun.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun.json index a4f8655ff9..f5696d5205 100644 --- a/resources/profiles/FLSun/filament/Generic PLA @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @FLSun", - "inherits": "fdm_filament_pla", "renamed_from": "FLSun Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JcpwaJCVC9MoJrPB", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json index af00b2272d..daf2d6cfc5 100644 --- a/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA High Speed @FLSun S1", - "inherits": "Generic PLA High Speed @System", "renamed_from": "FLSun S1 PLA High Speed", + "inherits": "Generic PLA High Speed @System", "from": "system", "setting_id": "ONz6C8a3AMGWxqdK", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_multitool_ramming_flow": [ "10" ], diff --git a/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json index 7468aadd31..e53b94fe26 100644 --- a/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA High Speed @FLSun T1", - "inherits": "Generic PLA High Speed @System", "renamed_from": "FLSun T1 PLA High Speed", + "inherits": "Generic PLA High Speed @System", "from": "system", "setting_id": "en1l0jgFX97t6qUi", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_multitool_ramming_flow": [ "10" ], diff --git a/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json index 0ec0d28da4..d4425663dc 100644 --- a/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA Silk @FLSun S1", - "inherits": "Generic PLA Silk @System", "renamed_from": "FLSun S1 PLA Silk", + "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "NTJw0fbcn3JoOr0R", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_retraction_length": [ "nil" ], diff --git a/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json index 891697aa01..b5c18fb00b 100644 --- a/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA Silk @FLSun T1", - "inherits": "Generic PLA Silk @System", "renamed_from": "FLSun T1 PLA Silk", + "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "y2p7TTGI8XWIeiQY", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_retraction_length": [ "nil" ], diff --git a/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json b/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json index 87b301513e..e5e25b612c 100644 --- a/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @FLSun", - "inherits": "fdm_filament_pla", "renamed_from": "FLSun Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "teBJEScAMecyn3JU", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/FLSun/filament/Generic PVA @FLSun.json b/resources/profiles/FLSun/filament/Generic PVA @FLSun.json index 9279ece682..0117b6fad5 100644 --- a/resources/profiles/FLSun/filament/Generic PVA @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic PVA @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @FLSun", - "inherits": "fdm_filament_pva", "renamed_from": "FLSun Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "hyVWJBubfQl497iO", "filament_id": "OFDvXujf", diff --git a/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json index 76e27d9be3..21fe1d4443 100644 --- a/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @FLSun S1", - "inherits": "Generic TPU @FLSun", "renamed_from": "FLSun S1 TPU", + "inherits": "Generic TPU @FLSun", "from": "system", "setting_id": "xDnQih17nXmGPoPc", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json index 25f60f10e1..bfaea98bda 100644 --- a/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @FLSun T1", - "inherits": "Generic TPU @FLSun", "renamed_from": "FLSun T1 TPU", + "inherits": "Generic TPU @FLSun", "from": "system", "setting_id": "TEakmydLXxrHti3G", "instantiation": "true", diff --git a/resources/profiles/FLSun/filament/Generic TPU @FLSun.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun.json index 70d1b8c42a..199a85987a 100644 --- a/resources/profiles/FLSun/filament/Generic TPU @FLSun.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @FLSun", - "inherits": "fdm_filament_tpu", "renamed_from": "FLSun Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "gJ3UZr4n4K8DPdBz", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/FLSun/machine/FLSun S1 0.4 nozzle.json b/resources/profiles/FLSun/machine/FLSun S1 0.4 nozzle.json index e75c40726b..a2adfba683 100644 --- a/resources/profiles/FLSun/machine/FLSun S1 0.4 nozzle.json +++ b/resources/profiles/FLSun/machine/FLSun S1 0.4 nozzle.json @@ -46,45 +46,59 @@ "80" ], "machine_max_acceleration_e": [ + "40000", "40000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "40000", "40000" ], "machine_max_jerk_e": [ + "100", "100" ], "machine_max_jerk_x": [ + "20000", "20000" ], "machine_max_jerk_y": [ + "20000", "20000" ], "machine_max_jerk_z": [ + "10000", "10000" ], "machine_max_speed_e": [ + "1200", "1200" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "1200", "1200" ], "printable_area": [ diff --git a/resources/profiles/FLSun/machine/FLSun T1 0.4 nozzle.json b/resources/profiles/FLSun/machine/FLSun T1 0.4 nozzle.json index 3cff2526eb..a1d43dc592 100644 --- a/resources/profiles/FLSun/machine/FLSun T1 0.4 nozzle.json +++ b/resources/profiles/FLSun/machine/FLSun T1 0.4 nozzle.json @@ -46,45 +46,59 @@ "70" ], "machine_max_acceleration_e": [ + "30000", "30000" ], "machine_max_acceleration_extruding": [ + "30000", "30000" ], "machine_max_acceleration_retracting": [ + "30000", "30000" ], "machine_max_acceleration_x": [ + "30000", "30000" ], "machine_max_acceleration_y": [ + "30000", "30000" ], "machine_max_acceleration_z": [ + "30000", "30000" ], "machine_max_jerk_e": [ + "100", "100" ], "machine_max_jerk_x": [ + "20000", "20000" ], "machine_max_jerk_y": [ + "20000", "20000" ], "machine_max_jerk_z": [ + "10000", "10000" ], "machine_max_speed_e": [ + "1000", "1000" ], "machine_max_speed_x": [ + "1000", "1000" ], "machine_max_speed_y": [ + "1000", "1000" ], "machine_max_speed_z": [ + "1000", "1000" ], "printable_area": [ diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 40e37cba03..be6e64da1e 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.10", + "version": "02.04.00.11", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json index 7ba9ffc527..f394f8f15d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "fgEYZ1Mgyp1AvtwU", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json index d797114137..020a3ec800 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "cIxbQMVdG5K85rJr", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json index 82e08e3f49..ecdcc55df5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "9GXBeuCUrScJfmJB", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json index 0ea70e0bf4..eef66d26e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "rDW4AwKc7SD7WIxN", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json index 5e5ce18eea..30714730ad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "ds0GgE1jssl4IbF3", "filament_id": "OFibWuBd", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json index 9ea370b14b..ca1681ca27 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "UTWbwTYuXYbBx3uw", "filament_id": "OFibWuBd", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json index c38639dd89..5f0155e58a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NttDJCrfB01uwMDl", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json index 9709d11e22..29115ab4d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "hJd6dG6OdEffEFC7", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json index 2f3d072baf..8fed11ee6b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8yFCuCnEuI3dUvQy", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json index a6badb7396..763e98e344 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "np4fP5kghRlczOTT", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json index c70351a9b1..6ebc5b5fc5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8o2maTFOXq0XR6Dm", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json index d6be224ddc..bcf7f43a43 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vCsjC0UnKenzIR0O", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json index 9ff2f3f54a..d074cb6f53 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "xhxVdlmh5r7meoHo", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json index d2c5c73541..129253e9d8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "6dlQN4Xhd6kGZ0Qn", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json index c4b58df04c..18f6622fa6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "r8WVFPozL8f5oLVJ", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json index ebf003f20d..17cc2d9f95 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "xw0pZNmhw1K4tPQ1", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json index 8be3cb0913..b2bb4df5d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "m6QLC2UaS3fW298i", "filament_id": "OFibWuBd", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge ABS Basic" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json index 398f80f8a5..1289d1c7ef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Nx3Px0Zu356IKShT", "filament_id": "OFYTIMbj", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json index 3fd0dc97ea..f4bf737da4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "d4EGsmMeEDCOUBF2", "filament_id": "OFYTIMbj", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json index 043e0ea208..e0a4aa3260 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "9ziPFKsjESbw1pXL", "filament_id": "OFYTIMbj", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json index 77148bf480..25550aded3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NzJJs6yrSik5xuyX", "filament_id": "OFYTIMbj", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json index 8cb591fa47..0d4d387a4e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "UinlbuXNbad2kN0s", "filament_id": "OFojbdhR", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json index 3fefbd7a96..c1cb75784b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "ycgiXY41kqNgslE3", "filament_id": "OFojbdhR", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json index f7d1332ec2..ee9f015d7a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json @@ -4,10 +4,10 @@ "inherits": "Generic ASA @Flashforge", "from": "system", "filament_id": "OFJS560n", + "instantiation": "false", "filament_vendor": [ "Flashforge" ], - "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json index 0f99d476fc..a80eb8aac6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "kjS4k8nrIdNNNoWw", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge ASA Basic @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json index 9a3aac8573..d626f4b25e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.25 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Y647IFVkk5JIXzte", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json index 7a199389af..84907ec84b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vaOyXUcrJ97KE7ZW", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json index 3c2e7173bf..55a3bb3550 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "iLWq5pJ3ox9EAM1Z", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json index 68f66a1f6b..b58051e0be 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "i7PUPYxy0Z9weyyA", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json index 80943c015a..05dc0925a5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "FY9mcqOyuu1Gqq1m", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json index 5aec1c1d8b..ad94105eb5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "UUSDyOetXSOuBIUd", "filament_id": "OFFFg2Pf", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json index 18ae2c78f1..9afefb0909 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "2r0kwhklE24Hp94O", "filament_id": "OFFFg2Pf", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json index 66ae12c06c..87e870ecae 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "w8O6oenp0NymzCqf", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json index 166d3a01ab..03849119fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "thhmWRzNYLYJOeR2", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json index 54e47a5e64..bfa2769868 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "g5jiz6Q6or23BIo7", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json index 01db10d49d..66db692dd2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "7xmWlHHNMvXBKdYS", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json index 9cdc87b1e5..8e81c9b855 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "r0B8KfZ1mNWMvGqE", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json index d8801abca8..ae0473e389 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CBLZqLhkwf5XKO12", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json index 1cc08eabb3..30234b7f4c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Df3anJxiRXLVO9hw", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json index 30787c9de1..3ba4b3f7fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Nu4WvBWuEhazZfh5", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json index 5b73e31a49..465105b8dc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "hF0h4ye3hMDtEba1", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json index 05223314f5..b85d3cf82a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "3isZCWr4CBjFtGDX", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json index 2500eacd3f..100726da10 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "SU6r879TbQMUFCij", "filament_id": "OFFFg2Pf", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge ASA Basic" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json index 5cd421f15c..7daa8cfda2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "TqU1elqwuVr9EhTA", "filament_id": "OFq0TY7C", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json index c61eb8159b..7119ae83d9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "nMczAtoc5W0J2WkS", "filament_id": "OFq0TY7C", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json index de98bbdf41..c5cebbe5e0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "941E5MaAyFY3iv4V", "filament_id": "OFrZDhVt", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json index 0bff2a9e2c..ab61e17048 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "RdmsxyUGUX8Ot4oj", "filament_id": "OFrZDhVt", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json index 608d143031..5f7e75ad38 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "ckwc7U0Q2eKHmCxY", "filament_id": "OFvaLVML", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json index 14a3d39616..eda0021d7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "AEQYrT7e4Q5J2G6C", "filament_id": "OFvaLVML", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 nozzle", "Flashforge Creator 5 Pro 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json index bb2f4387b9..b6071e5dc1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "jUNUZhE0BJyB64fC", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json index 597e24ade7..93a88f3576 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "0qMEqo9YMDLSVafs", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json index 5b17792267..b71f191b47 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ek749gIdUAPq6WxT", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json index b79fa3d0d2..91a8add8fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "tEohTtyHofD6l6o3", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json index 96b5849040..e1d3687137 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "oLeLrIjFJzoZha3E", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json index cb385fd395..fac11c2185 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "HXGUlYY4X5IHhL3R", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json index a32508d8b0..a7932d87e9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "g22Cv3zy3h5BhJYK", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json index b2958e0032..08db515203 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "aDzBXuvN7IuSP5sa", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json index bbbaebe8b8..4b2c461dfb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CIj24REX7BA8zPHQ", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json index bc52c94e5b..205591ea81 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "yAGyGjF6uDrjfjLn", "filament_id": "OFvaLVML", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json index c1dd59623c..4f87423ffd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vOqAGzaYLz0XdRvC", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json index 21198590ac..6d80e34383 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "KSuxZ3fpQz0khDSz", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json index 23703621f3..4e3f23c94c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o4B1kAToVny7jw0M", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json index 5825f17141..9eb341d698 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ZpNEEHTtvhMJS8Kv", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json index a48606e3c0..a74c501133 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "kpRved5M3NktqIYn", "filament_id": "OFDxxTpW", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json index 9ceca02a50..72be5b0240 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "ypxgjHl9uIMyZIce", "filament_id": "OFDxxTpW", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json index 28565a5c3b..abd6ad90f2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "q9UbakUmZPzG3xU0", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json index 592b3fe094..deb7150b48 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IL18Lu0qHx1RVqKD", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json index e4b953f089..52d9c81da9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "2FQib7fZjcwfCnm2", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json index 3534f1a60b..6d7728b5d9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CtwOm90WWD4S7U6j", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json index 5a47b94941..fe42a7839c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "kvULpm0WhKiSPj8V", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json index 26df92ae7b..6915366030 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CUU7knzm4cbe1giE", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json index b936141d13..51ca8798b7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "gcYvL572cumWZdnl", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json index f53c9c41e3..c8c5e5a53e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "cx99AH0C575XxAj9", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json index 263224a1ea..ec23e9a241 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "RrrKoR7MVD8IFQlq", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json index ff09b6e445..80dcdfccd6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "7VEPGuR16wNukAX2", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json index 3ee8ed9e42..dd06f811c5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "H9uwlPw6m6Nf7qH5", "filament_id": "OFDxxTpW", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge HS PETG" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json index d511cdafe6..35d20cded2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "OmDped3weZ4uHAtY", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json index 082b03f19b..2c2162d5cf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "oD592bif4ra0ADco", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json index 6571d871b4..5c11af86f6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ldhMY6F7v6nK8wwf", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json index a5b788402d..df25c44944 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "5vzOmbjHbkJXrgYM", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json index 9f34aa44af..2df2ee66c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "2L7FS5JeAyPb3y0s", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json index 85c0b17327..2106876030 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xSJk7LFpYKmckPQh", "filament_id": "OFIK2H3G", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json index 667e4045b9..08dfa6d74a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xdFZUsj1cNLXdvT6", "filament_id": "OFIK2H3G", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json index ba4f6bc6d9..2ccf5b9e65 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "hzxRPyH1fqarsMuN", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json index 4e69e17253..4b0b75ad6c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "oJsLlIIpxwGSoJTv", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json index ad8f07ef26..551945e272 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "hJbNZ381ERkZ0KUB", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json index f202e50f11..81a37ad4f5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "BqavrNpwhXDXcZ3r", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json index 7472f78b02..a77b12bced 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "cgf4Qk4iHZh7zHN5", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json index 2bc30165fc..737ba3b476 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "p31K69Srld6o4sQ2", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json index b5308a0f8c..ef76855837 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "MwbYvnRIzlNmH81h", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json index 2c2ee97348..613fb82ce1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "rKhHmkqXYD2xN4K9", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json index 88184f5a92..caef6473f1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Dshsi3O7NvYYjXJt", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json index cd59be156d..d127543ac1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "mfnL6QEevCmTmOL0", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json index 3281932fe8..1541e28697 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "AGLHrHKWye0YTtNK", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json index f5de82a8bb..c924aa4ee5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "px8qzmB2yFLoNl83", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json index da6fd90d98..ff90bc0593 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "mwuIEsBz5bXEV68w", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json index bb2d6256b6..0721d38cc0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "TielygFT88owWg4J", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json index 149406f025..59dbba6ad3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "It2NI6OFhNEUvulz", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json index 22b1a35dcb..a7c152efc5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json @@ -1,15 +1,15 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", - "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "renamed_from": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle;Flashforge PLA Buint Ti FF G4 0.8 nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Qt3huWxoYpMEqEN6", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json index 6fb09f1458..59609aa49d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Y3XuavnnOMoHLGHA", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json index dccc672613..8361d79c60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json @@ -1,15 +1,15 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", - "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "renamed_from": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle;Flashforge PLA Buint Ti FF G4P 0.8 nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2HUxAWeolJIlxPs1", "filament_id": "OF8O09RG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json index 22c1c9870f..c2bd7154f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "V4jIUQzxoZkK50mn", "filament_id": "OFXB8ZI7", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json index 8002ac7ba9..58f8fca603 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vdaZBnDsmUC1fhDp", "filament_id": "OFIK2H3G", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge HS PLA" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json index f5d60553e6..dabb15e3cd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "u7rolQaTQz9U6veH", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json index 8b10616a83..c8b9164985 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "qTGTwiliWj3dSo9y", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json index ec1ded13ea..00c98624be 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "wAkuJRTLWxGyBU0b", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json index bc05757132..066cc81a69 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "dbs29hQSQl9zuWis", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json index 1e5eb664ec..9c13b3abb5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "XGNPvS2ps7Xn2fpx", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json index 21ee8da2a6..1125a33164 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "h33iEGZ7wPeBYKYQ", "filament_id": "OFEvEfw5", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json index 2b4f6fc95a..27eade4316 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "e58C9MdOWikIbbVR", "filament_id": "OFGxuI0n", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json index b75438e584..4681375016 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "RX2Tg8KpwQpCbkLI", "filament_id": "OFGxuI0n", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json index 3379bd5c39..e6e036a4db 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "C4DfYuQgDXIgK7mk", "filament_id": "OFGxuI0n", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json index 07653a9002..e52bc920d8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Yu7hL4izNsgDVqMT", "filament_id": "OFGxuI0n", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json index e88cbb31c3..f6aa5e7a0b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4 0.6 HF nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4 0.6 HF nozzle;FlashForge PC FF G4 0.6 HF nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "Tj504IYSj6mUDR6E", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json index 6b1decef09..a4eb9726c5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4 0.6 nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4 0.6 nozzle;FlashForge PC FF G4 0.6 nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "VfhBf8676qCWatKP", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json index e1740fb30d..d08b0bb2f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4 0.8 HF nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4 0.8 HF nozzle;FlashForge PC FF G4 0.8 HF nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "ILBm9zXX5U4Oh82h", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json index 11ec475184..70b46e169e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4P 0.6 HF nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4P 0.6 HF nozzle;FlashForge PC FF G4P 0.6 HF nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "Kj6KWBfSuFALX2sd", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json index 38ca36a685..466e515c74 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4P 0.6 nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4P 0.6 nozzle;FlashForge PC FF G4P 0.6 nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "XjAM4PMXLCBwdgQf", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json index dfdda7bfe2..ea43b47767 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PC @FF G4P 0.8 HF nozzle", - "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "renamed_from": "FlashForge PC @FF G4P 0.8 HF nozzle;FlashForge PC FF G4P 0.8 HF nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "icAIkgRCZAjz6apM", "filament_id": "OFWXCbVF", diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json index 7157336d3f..0a0fd2d622 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "3bguiaEtUsS8ULHW", "filament_id": "OFrjacXf", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json index b550ae743f..7d19965089 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "W6i9E22BVo11TeCm", "filament_id": "OFrjacXf", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json index 3d5c4f4b0c..f257a24995 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YLLJ4xZI704GReej", "filament_id": "OFYYeMyQ", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "60" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json index e15f011f1f..3c4126159a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "dFZ1MmHjj1AAIaMm", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json index a3d431030f..a93a6ed04a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Ro3rt7IAJrA5aZD6", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json index 7cc361d89d..05e1b984eb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "cTxrnqzr2wVt4Nj7", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json index b1a6a9f7e5..f81aba4130 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "rPy6e6kaIt2tI34j", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "60" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json index 0a1b47b916..14dbf52b99 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "QA1KD03F0zj2zsVi", "filament_id": "OFXiArjA", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json index 69cb6ee5e8..2cafbe8043 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "EU8Q0XLjED23MNer", "filament_id": "OFXiArjA", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json index 746eb1cc61..5493fc1566 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8x6yU2U8d5f67N73", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json index ecafe03349..92e11c5a7b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4W0nfaSSZdg2HQkh", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json index 94b757887a..ef509a6e8d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "AJcugKx4qHPJ3JAT", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json index 8308064c52..ccd4fedb6e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "R0nZuLXEo5qA6Mt8", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json index 8c1de1d947..c2ac1bc1f1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Ql2BBBymzqEG7GKk", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json index 60bb0ae243..f509ebd2e4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "KU5tDHAKja1sCoHm", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json index 24ed205273..83f839dc15 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "sb6jD3UZmb0DNIsC", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json index d993d05592..821f640057 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4BB1wJLtsXus5eyY", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json index d8bdc53caa..bde4793410 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "m7oJx47UMlFctMkX", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json index 1bd2c4cdbf..c478014ab4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ozD2wU5UiORTtJsa", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json index df9948d863..ca41082534 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IQfUoy7gTmVmBDL5", "filament_id": "OFXiArjA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "60" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json index 2d29ad79b5..ec4cbe4150 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Ht7wzk8l0b1kv5tZ", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json index f1b7a3b4ab..8b1521d82b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NJFHpa5HFHIyHSWu", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json index 252e51750d..b96a53dc08 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UaObrRNSTwitC6jr", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json index 15ccd1d0ac..864e757268 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "axOWrjnN5lofH9qM", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "60" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json index ed8c6fd0bb..6b931f2732 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "TtXy042wtT6nF3WB", "filament_id": "OFwjMiKL", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json index b6395b0325..34271c74c7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "66OWHhGyuaFISu6v", "filament_id": "OFwjMiKL", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json index 2ab27e8567..0b2fa34dcb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "K8WkJmFy2V1zhYQO", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json index b3c10e9970..723bd68852 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "LLK1hwKZhDU8SaGJ", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json index 8c29f5a466..840424a6ca 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "LaUF2HJtBnpZF7Cd", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json index f38a075dea..3e4dd0451e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "OUToXk8ddS1RPPUK", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json index d907e48ab5..f4204e031e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ywff8rI39XKjcocY", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json index 0dfa3dfee2..5c61d8dfde 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "kuCvwo6Phr6Ywhm4", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json index 91c49b1c85..cbb85f11e4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Z2E69w9AevYg15tl", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json index 0ac80ad83a..5ea183e50c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "RkQaxwTjhJK0A3zr", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json index c920f757e5..dbfc255ff1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YBQTMes2S9iJjKDf", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json index 0213d9e14b..e454323a33 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "lCngVWG3q0FWsnrG", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json index 7502aa35b6..7e7beee06e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "3Gv6MJ3RRja5pbOM", "filament_id": "OFwjMiKL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "60" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json index a516f371a2..4b02af402f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "bcqYod61blJRzhK2", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json index 7a51f2615a..3218ae7e22 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CnFKOi7fFyS8QlKK", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json index e401baa389..eaa57a517b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "eKWJW36I5fVHwjWD", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json index c4001061f2..e257f61b10 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "aDSOS4PWssYHk8Fh", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json index 52901dd534..3e0640128f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "RXRERfs2oQKewpPS", "filament_id": "OFuFEtKX", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json index dda9226bcd..59da2d552d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "8Ns75F5n2fdQ8sDk", "filament_id": "OFuFEtKX", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 nozzle", "Flashforge Creator 5 Pro 0.6 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json index 71c68991d0..b01dc6e877 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4EgMPzlVo1rTeQ1e", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json index b0b2ec7360..7106a199cd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "K9ME1F4oJkPi8jRu", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json index 668e1af37a..67e4d0bcf4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "9jCp0gTjB3Mt95Mj", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json index a0200ebe49..1f40be2ec7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "d5OleuNNZBJK9vxH", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json index 57b297768c..4c6b3b130c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "MpG61mwVUtJ7t602", "filament_id": "OFuFEtKX", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PETG-CF" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json index 7c929b1363..044604a134 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "gMmhMDqjmJfAYcbV", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json index 7f66423bbe..98b2473f4c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "0OsrtqfIxrEJMwac", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json index f698b05b32..f0d25bf349 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "fuzWVrfZqekMETLK", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json index 6fdc1bdb17..87760ea716 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "HCpI817HAWckXBtk", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json index 6893946556..60befa66ee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "FmUnckQofjunAtwr", "filament_id": "OFJ3F2jm", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json index 9a7c7080a0..aaac7134ad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "Q0RsVOPLuMByur9c", "filament_id": "OFJ3F2jm", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json index 4ed8203529..7d6df18572 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "R54l7TcwsjdPHvNB", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json index 731b59748d..2a32b29f00 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "MELEwYupDkT2DPxL", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json index 24eb70b646..c740682350 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "uGLvOoPAfksLO43M", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json index b9ab2a97ec..232a7294d8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "gGpKvk3rnLuTjOwo", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json index 2d81ff10df..fb1e3faa7d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Yopqnj4b5ZVwigGx", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json index 9c6d20e0e0..32ff549bb5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "QEfQrqMwApuSMqih", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json index 1285b05257..61c89f8c95 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "BAPIn3eJAPGpscRJ", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json index 784f6dfd17..be05a3d90e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "44BmRNRb6vlPq8qe", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json index 4fdcf94869..aa5960059f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ltJbhoAeAec9gxrS", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json index 57305d4cc5..736c0f4a41 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "GxdZiXdqns72ibQl", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json index 12a8f6cd79..48c4ec6983 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "5XKGaHUjxHECbnHO", "filament_id": "OFJ3F2jm", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Basic" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json index 4f5eca6889..445ea80872 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "TF6BeOl0patjpPaa", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json index 950effa7cd..b6fbfe419b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "nkYeEBo8NdkJulAP", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json index bf6dfb230f..2cce8c7bd8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "yEDfsOsogfZbNBVX", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json index 2eeb85526c..8547fa026a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o1Fl6t8nFCKZoj3Q", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json index 23bfa9be0c..95b8e02fad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xZmQdh487UMtvBRu", "filament_id": "OFMkAW6r", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json index 6f5e1afb0e..d1871c007d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "rc00SOyIg30uE3Da", "filament_id": "OFMkAW6r", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json index 31a99ea10e..6448467d0e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "G2Et7kPHptMESzQ0", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json index 07fe12f973..06de5aed71 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "zsOdmFGBSF9UySMN", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json index 3a778e5472..ed80aad827 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "oxRMuvBMu9qdQWUQ", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json index 8657a4010e..f644a8ab18 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "5hwNJvvLtb75XBBg", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json index c185b26f3d..9b06bfcd58 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "mGj8VEyOnnogpkmF", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json index 9742b8aefc..fd5370bf4a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "JDcRA6apekWLXPvH", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json index 4d3681736e..79fd7a6636 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "b5GJpvKYktP4vZpj", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json index 6eb75a8f52..f4057e2860 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "RjUpQV6iQxTircwj", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json index 26609fd995..1f181537a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "9DEZ6SmFdgfluhsR", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json index e660d0f569..b5528cac52 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "girTMkusNTfY04rz", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json index 29f68b0f62..c216b7fd22 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "pCQ2qmeXUyJzP7kS", "filament_id": "OFMkAW6r", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Color Change" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json index d66bf2b24c..7b10963fef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "y8TNaRebTrmFem10", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json index 65dffd3601..37c76958e0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "qju0AMvvq0B5Glny", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json index 1067b50067..b49adc2988 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o8gGBOEcNvlbZxGW", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json index a833b55331..2347ddf9ad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4rpfTTgZrsVDwxI9", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json index 2ce8486cb0..407744a897 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "0RkkIcIUFgwOFTBY", "filament_id": "OFJJ0Ar3", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json index 373a81bcdc..7320f6e19c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "9qVabnSl8xfKSIYX", "filament_id": "OFJJ0Ar3", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json index efb7dad130..3bb954210b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "koEC7DteUoXHUd2z", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json index 64b442938c..70e94be7c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "D69fWcXioFcpoUjC", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json index d20dc55d41..5b3136029c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "rfiQUncdSExEaK0U", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json index 346dfad0a0..7415d88645 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "WX8lK8efXIVcpjFf", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json index 3b999c0734..139be55915 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Tzvo3oILQJc4SQko", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json index 1b8e75eb32..93387df7e9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Y5gm20O4yCCDIoC0", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json index d39114697f..9b2d3bdae3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "80vSQxnHfd5ZUy5h", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json index 185440fba4..d8cc2481f4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UZi7T5VoasmXWyH5", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json index ec0581df11..265b4f865c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "6UlSb4fqHIMdMxkO", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json index c1818186cb..8a87da7aab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "H2Cr4B5VUaxyYsN0", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json index 785e26ace5..4e7bc2c581 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NJrc0UZ54Fq8MaqF", "filament_id": "OFJJ0Ar3", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Galaxy" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json index 36e0a64d69..dc00b7b598 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "2QZaQyg66IJPbsSc", "filament_id": "OFDDdgHM", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json index 3e106a6eda..301ed1b8c0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "GdvXL8SrKrYHxSgZ", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json index 446137267f..9074bdd547 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "SLYD2YcQTQgbSjIF", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json index d605b1e444..3d1da264d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "kOobFSlqEG9Qe0d1", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json index 0be02b85f5..c81af34a7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "GqNeJoH4M1IVAXrZ", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json index 5efeada6af..66fc70e7ed 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "4sE1LTVVuRglRbpD", "filament_id": "OFdqkWtz", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json index 485a3b51a2..d69b537c6a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "jEUZyaEIBf2eXXeh", "filament_id": "OFdqkWtz", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json index 0b58399215..1f8feef089 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "xPPSRmadqfqCtRF2", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json index 792049300a..e3a3fc5ee1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "aWVXIk1xVa9URR1D", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json index a218752f68..93632d0992 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "KhBF7hHHVPzqiAca", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json index 615e05d2e6..d570838ab4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "sTplnj3gMAzwtLWE", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json index 65e6995584..bb66eccb3a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vXPXOKD8vNJlujM1", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json index 7704d5f2b8..9a99a237a3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "purqxjmWiflDrnik", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json index b9f94e604e..f11ea26336 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "qraQ97uusigB63hv", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json index 5ce6582146..d96d107b83 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Z1NCX8XMyIVlOlWn", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json index 46151a4496..7228ed0f99 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "s620OFLTgFT4Ds2A", "filament_id": "OFdqkWtz", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Luminous" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json index 2774450e57..32ec6b37ec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "BVmVfNCuy8HDhcEI", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json index f03dc70fd1..0fa484f6b6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "WRMePGzDGdEGiqNv", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json index f009759cad..f6b304da2b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "thnbuaLDDlGrkrdY", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json index 33a2228f8d..cc0a51eacf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Jk7PRQkF2lFEtI8Q", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json index 230a723624..a9637b4b2d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF C5", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Matte @FF C5;Flashforge PLA Matte FF C5", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "ct3nO6w9j58gqDI0", "filament_id": "OF6qAuyi", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json index 0d7543cc09..8386a4424a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF C5P", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Matte @FF C5P;Flashforge PLA Matte FF C5P", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "Bn2BaG7f1tkvlyYI", "filament_id": "OF6qAuyi", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json index 2ff2a07363..d3df0a765c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8b9q1FfVljPmKoEt", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json index f49e19c292..7263fb66b5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o9dOrLgL6efF19O1", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json index 98e44f21f4..7036ec3ffa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "QoRmDvhoeGi6Z2xv", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json index 7eda7a4b62..599e8dc771 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "dHyuoORAUGLtlGkJ", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json index 698511967d..a8c257fea1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "OgqVyIHfy3U8Dc6d", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json index c868aa0137..2e8676a2a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "feXpVbDM5ON5mwg0", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json index fc205bb684..5f9ff2e3bb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "XMnZQ1AxXPJqpqRX", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json index 42dc4c9c15..ef6c9b3010 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Ke0bRKPNKSsVMO1Y", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json index 1d76131870..0345d9b8a4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IRC2n4GaofxvvyTt", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json index 63d6f372e3..661fd7e800 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "RN4wdTL0qccM4huZ", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json index 781357b1a1..b747e3a26b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ipMevDMORKqZYdvD", "filament_id": "OF6qAuyi", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json index 27caf06739..33f787d3d3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "uusF7Vz94HOwoQF0", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json index 4f01562a04..2e3bd9c33a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "sHZWzrZO8PP0QYZR", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json index f85391cb2b..6bec10ee8d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "bxwjEFI8HmNY8JI6", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json index 1ef06a756b..4cd41a44f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Gs8hS5CpV3W62pjs", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json index d382637556..35fa843ada 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF C5", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Metal @FF C5;Flashforge PLA Metal FF C5", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "AdjRSTc9RZG6mJ1e", "filament_id": "OFAebKg8", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json index 965b6fe595..fc69dcf2a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF C5P", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Metal @FF C5P;Flashforge PLA Metal FF C5P", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "k0AQO2dGbk0qvxzO", "filament_id": "OFAebKg8", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json index 8fcf56e6b6..b50b30e1fd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "5xqdqoj2l50FegPF", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json index 352adaa681..6e8d01fc22 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "R79SbWA9i2OAu2ee", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json index 8d78236629..422abb7e48 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "zjIN4KzIOwI1VwOc", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json index aaabcaac60..8fbedcac7d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UxMNNil2KnWvAJ4q", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json index b1035a4629..53c81cc9df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "57i6iKrVYUS5UiBT", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json index bf06971c23..2ce77f2098 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IYPw8a9tkpuf95uH", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json index 7d85d6e56f..5be845c3cb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "I0bULoVAbtVfQoCy", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json index 9c6e1b92b0..cb7ca9ce1e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "DbPo3ay2e4a002AB", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json index a79ce03a5b..d386502160 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "uztv4hhm2O3T93zZ", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json index 82bf12c247..948e047ffa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UFWWrhfgS7N36Y8W", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json index 90d419bfa5..4110cc586c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UD5i0ijsirfieUvb", "filament_id": "OFAebKg8", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Metal" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json index d56ed06c1e..38e48d781b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "t9lPSFnwLDk0ARIp", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json index 423b8743a7..db4ee0563d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "SBSlOEwZSvZHeX4r", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json index 0ab1f650f2..92cf8d55ab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "DbWTm2H71izMWmpx", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json index 416c8bf207..5f2a38e02c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vTVCr1id0cTtMzuE", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json index e02f21dbd3..668707306e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF C5", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Pro @FF C5;Flashforge PLA Pro FF C5", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "30eBjTZFg6vDZkc0", "filament_id": "OFm4SivL", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json index fedd74b2c5..0805a77333 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json @@ -1,15 +1,18 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF C5P", - "inherits": "Generic PLA @System", "renamed_from": "Flashforge PLA Pro @FF C5P;Flashforge PLA Pro FF C5P", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "xOvxorpWP37CQCfi", "filament_id": "OFm4SivL", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json index f3dd8e04cf..6012a3cc75 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YcXuvz3qYHtVoWxv", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json index 7dc8528606..6fa23af370 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "prItyXNphhuPCAce", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json index 57e815ab25..9d518f1c67 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "83zDmjaAgxxIt7KU", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json index 35bce9d866..31e86195bd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "px3O28Olb9LExqfT", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json index b04f49d81b..a86a8d4c73 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "QYgsCCHP3Khqrzh3", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json index 07b82edf7f..390ccaa53f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "1ro9wHPYhuMHNiYe", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json index 433318fc86..d4829bab74 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4W4a7c9ugUVwvvmn", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json index 87031ba66b..3902337856 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "CloRo3qxvzxHZuIP", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json index 281a34a2c5..6f89effb8d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "QgUbP07tIXmFysEb", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json index 8d29d1823c..d5b49f18eb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "6mvGOtkPZT6ROboo", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json index e70b87f9a9..cf0dd71a81 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vI875WYbMyQeMwlh", "filament_id": "OFm4SivL", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Pro" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json index b232f00632..1005ecbcf0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "gxl3i7jTwkzrKxF4", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Silk @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json index 3bbc1afcb1..ac59ca225a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YH9IHXOFMKwcTLyA", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json index 36a3c15a4f..2a55fcc117 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IfAieG0OAG807xlu", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json index ce5ecdb2aa..db75066f14 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "N6J7QqQ7TIgM3MyW", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json index e157b16c6d..5c7f51a024 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "XXmeUWaLyVCTDS6G", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json index de9c9be46a..4ff076c635 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "OIsfpi49wEoF0ekO", "filament_id": "OFgjgN35", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json index f82bc5efc4..996e0c3052 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xxeZ6VPjRFevxDnK", "filament_id": "OFgjgN35", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json index ec7a71f35f..b1de1db0c9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "2GZp8yjrY1OioFDi", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json index 36090afaf7..fff6e7d313 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "U0XtCVUhIMnidhbR", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json index 558015cb87..777fd93940 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8j9kaYy3ghkF81Cu", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json index c37e0f6341..7286eca6aa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "E0LeJwSxaniDkB0b", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json index b7f4f619ec..46a4b9e268 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8rggqgJ9kg9yLE28", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json index 047cdcf879..df57e3437e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "uY4OWhIytHMz4rWq", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json index b5f36b7483..dcd315eb34 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YSkkXd9EhhEHvGpf", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json index a41d10e40a..c2b25925c5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "XlxXZj9Wi1D6IwCE", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json index e95f7ad1de..fd347929e6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "IPyXBSnMCAikjI9V", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json index df4894cdb1..d11fb0e157 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "f3gJsovSmDKoA7BP", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json index 15239129d4..5f4826c112 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vZb7BvbyVWkZv3rR", "filament_id": "OFgjgN35", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Silk" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json index 3786cf7abb..6c0baf8308 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o8lsEnMIiHHorJhb", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json index c7fb93bca2..017caafcf1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "oXlxQJY0K6Dnri7e", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json index b6802db1b4..834976ea9a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "XKpFulrvvrfE56va", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json index b7954c6677..f9983c2e2e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "dscnwSfbrGWiS4Um", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json index 5cf32f2c38..1871eeddf9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "yeh5cd0tAHtHzdoQ", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json index 27380eb9e7..4a227d08f0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "q2Zi0YluaYpG3Ktf", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json index 42df4a0ea9..60e1fa25d4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "1qXV6AJqPpAwX1YK", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json index 7a11476c06..dd14fdd6ce 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YsyGGOGqUVkEqkIr", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json index 4a975e6f20..044d335abb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "UVvd018dTbygqTgy", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json index 0781dd641f..a064b07063 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "F0k8kkgWM5FkLAzo", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json index 9b4065c982..0b5677dffd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P HF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Oapl8InwbkwNSIDl", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json index 35ccf42632..65552aff78 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NiB6Yb4b0auyn9KQ", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json index 4be3dba6ea..5f91c27894 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "LYtdPgec1hBLhoQA", "filament_id": "OFV5c8hG", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Sparkle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json index 245e401283..a6f9bfe060 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "QRyISvTy06kCwxKo", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json index f456d8c7db..0fe961c8dd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "rmnF24E3SuwzRscH", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json index a39646f621..c167401434 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "BXPI5Pkp7a6pLrCh", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json index 542045cdeb..6589ef2776 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "EpC2ItdGUxFV7x1y", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json index a1b271569e..ef53b045ca 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "rBm25DRY1PAkEJ4r", "filament_id": "OF9cAwMK", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json index 189dba715a..4860f2c41f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xReo12oteZ4ECNJN", "filament_id": "OF9cAwMK", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json index 292cf5972c..34eec41e5c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "9PgjgxU7pLl2Dfpe", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json index 0faba78623..0a3aff8808 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "RuNKzuIsw7F1ogmG", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json index 77a590f1d6..036e937e59 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "YPuMCHNGDWh0FpIB", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json index 3bd2e72000..5c2741e7a0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "3uC056Y171ZjnQE6", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json index 10f87a860a..418e644f56 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "JxNlb64lTODaaQhU", "filament_id": "OF9cAwMK", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge PLA-CF" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json index 4242f0f8a5..315d522084 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json @@ -4,10 +4,10 @@ "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "filament_id": "OFV8Mxqx", + "instantiation": "false", "filament_vendor": [ "Flashforge" ], - "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json index e559b22a88..cef2cbbfa0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "DhC7iFgNKCAq4Zkt", "filament_id": "OFLC1oRH", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json index 96fa32ad12..25ecaebd67 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "Jws2AaLWaNyZhqX4", "filament_id": "OFLC1oRH", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json index 3df5398f11..11277a4ffa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4 0.6 HF nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4 0.6 HF nozzle;FlashForge PPS FF G4 0.6 HF nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "5x1ye2DAm3GvzmZJ", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json index 1de4d51745..5eced86546 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4 0.6 nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4 0.6 nozzle;FlashForge PPS FF G4 0.6 nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "yZoLC24CeKEyvkgA", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json index e8014ddfec..c43b7b3290 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4 0.8 HF nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4 0.8 HF nozzle;FlashForge PPS FF G4 0.8 HF nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "EsrSpDB3Kx35qb76", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json index fd2f854067..1aab3f1755 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "6NjEQ6RJKUAOrSLw", "filament_id": "OFlgMgNM", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json index f731181d65..fd9323cc7d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4P 0.6 HF nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4P 0.6 HF nozzle;FlashForge PPS FF G4P 0.6 HF nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Uu82gm86ESeidnRT", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json index 3eab34befc..ef12c6a66d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4P 0.6 nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4P 0.6 nozzle;FlashForge PPS FF G4P 0.6 nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "G6pIMZA5RC15kJoC", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json index a2662d8cc9..7c48a9f82a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS @FF G4P 0.8 HF nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS @FF G4P 0.8 HF nozzle;FlashForge PPS FF G4P 0.8 HF nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "SsK15iSJxrQWI5wy", "filament_id": "OFlgMgNM", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json index b841f62e6c..294fe8d4eb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "vFMKqNjQjlNxwvDI", "filament_id": "OFlgMgNM", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json index 58b2d242a8..ce58dc7c7f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "ihXPnFERMjbBgrP5", "filament_id": "OFTSXxzE", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json index 5f261953b3..7b8cab5254 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "UWFjBmSpUkZLBvoO", "filament_id": "OFTSXxzE", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json index b33fcb95c9..0ca1140813 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS-CF @FF G4 0.6 nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS-CF @FF G4 0.6 nozzle;FlashForge PPS-CF FF G4 0.6 nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "mMTi9QaW5xVch3an", "filament_id": "OFTSXxzE", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json index 48edb216c5..fabbaf7068 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Flashforge PPS-CF @FF G4P 0.6 nozzle", - "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "renamed_from": "FlashForge PPS-CF @FF G4P 0.6 nozzle;FlashForge PPS-CF FF G4P 0.6 nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "dSI79hoaa9jLGvhz", "filament_id": "OFTSXxzE", diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json index 90d94b9c29..ca3216eef5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "rSYGG2ni41NDVw6l", "filament_id": "OFaaddbQ", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json index 03fdb6117e..6348ec601f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "nwgbMjLRJLtJ04ri", "filament_id": "OFaaddbQ", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json index e5511d5622..c17d507b4f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "sN7eGcbuGZxGrbR5", "filament_id": "OFT02Lz9", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json index 1514862e44..725349ad2d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "f75oElm4zB0hukIj", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json index d6fda96505..7298c982fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "o4KYTpJF6KksX2mg", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json index 27d6515ccb..9c710563ed 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "HUSkDZL6rCpz0lRk", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json index 7db519170a..f96b992d49 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "8xgu0AnMuKbPWyVd", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json index 2123c33993..73df34ec44 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "Rgqt3MjxOye5EaFt", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json index a5ce644702..65e0df12a8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 65D @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "PBFsW5qhVbQteYh5", "filament_id": "OFSDfduA", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json index 897054d8ee..7fd3fce86f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "TPbHmcFyPyjvoERv", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json index adb4820faa..474c793788 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "zLMgsyDmdoXHhqFv", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json index 5c5f690cd2..8233c9eab7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ThakVhjfpgnAlEVH", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json index 19b0981798..e8c9ee8f67 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "2MT9C2rvvQ3uU1lG", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "cool_plate_temp": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json index b67887cc8b..b244df24ce 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "M0ozqaD3jSKoD6fm", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json index ae6049673b..fd12c0a3e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "ob8IkvzNt9CWCzbk", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json index 37bef9c3f6..792a504a01 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "NzxX1lyRJ7wLUihV", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json index c5b24e9e04..083214475b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "4FIGiheSGvSJPw3s", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json index 23cd8d6326..0ebf8ad04c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "1GNqSBaQitzhYSx7", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json index eb2a423bca..441792c4d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.6 nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "eOhMygyxaccdov7o", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json index f4b91222e7..5e41834400 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P 0.8 HF nozzle.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "LxooKiOkRncktNLf", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json index 9e675ccd52..656106c830 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "HdoJfbQr0uwQ6Vwb", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json index aa2f6251dc..1d1ea62a65 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "J4EaFhnpkLDcl5wH", "filament_id": "OFSqIcJC", + "instantiation": "true", "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "filament_settings_id": [ "Flashforge TPU 95A" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json index 5a4e304862..7098dd4ac2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "fd5bACFa33J7aTdp", "filament_id": "OF8GtyKJ", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json index 428afe7f1c..80b1f9964f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "hrcELA2qEMkZ6Wvj", "filament_id": "OF8GtyKJ", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json index 407e92aed8..6faa7d3a58 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "Lis7BZ3lMkoX5KQt", "filament_id": "OFwlZ7gH", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json index 611724b460..a2dc8ab5fb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "xY03Hiidu5YNSUyZ", "filament_id": "OFwlZ7gH", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json index 0c27bb94c6..69e930a3ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "AHu6wNV3zcPBusOF", "filament_id": "OFx0WlzS", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json index e3b05721e6..bf11fa31ae 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json @@ -5,10 +5,13 @@ "from": "system", "setting_id": "8MBRqfLIRdhxk1dF", "filament_id": "OFx0WlzS", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Flashforge" ], - "instantiation": "true", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json index 5ad0cca8f6..31c5d807d4 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json @@ -1,12 +1,15 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF C5", - "inherits": "Generic PA-CF @System", "renamed_from": "Flashforge PAHT-CF @FF C5;Flashforge PAHT-CF FF C5", + "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "gZqAGVOlWR79n7hN", "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json index b23f871add..952f16aa4e 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json @@ -1,12 +1,15 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF C5P", - "inherits": "Generic PA-CF @System", "renamed_from": "Flashforge PAHT-CF @FF C5P;Flashforge PAHT-CF FF C5P", + "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "nJF1lCOavNNh4yHs", "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json index 2fb2e00e21..0a963b57ac 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4", - "inherits": "Generic PLA-CF10 @Flashforge", "renamed_from": "Flashforge PAHT-CF @FF G4;Flashforge PAHT-CF FF G4", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "nH6pwFYsPyBzL1EB", "filament_id": "OFKW5hEW", diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json index 263323a60a..d4f32a7962 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4P", - "inherits": "Generic PLA-CF10 @Flashforge", "renamed_from": "Flashforge PAHT-CF @FF G4P;Flashforge PAHT-CF FF G4P", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "wmWMf3MfmbfZx2o8", "filament_id": "OFKW5hEW", diff --git a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json index c5d429456d..e76983e211 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "O3tz36NNMoagELL0", "filament_id": "OF0AquDh", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json index bb1ccc7292..5ee5ad5303 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "Gg9H6I32fOqoLSqE", "filament_id": "OF0AquDh", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json index b895fd4370..148f941f09 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json @@ -6,6 +6,9 @@ "setting_id": "pV5QERvRuROIZTOa", "filament_id": "OFCn83wF", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json index 6845961090..1237e3d98b 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json @@ -6,6 +6,9 @@ "setting_id": "0i7VkquM4n0uFaXH", "filament_id": "OFCn83wF", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "FusRock" ], diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json index b1112d508d..2ac906fb34 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PAHT-CF @G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle;FusRock Generic PAHT-CF G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "axB3SEA3AC7rmxiZ", "filament_id": "OFKW5hEW", diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json index 0e29324831..6f2d0dddb1 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PAHT-GF", - "inherits": "FusRock PAHT-CF", "renamed_from": "FusRock Generic PAHT-GF", + "inherits": "FusRock PAHT-CF", "from": "system", "setting_id": "yJJEULB0ra4GAS8Q", "filament_id": "OFcVLpNA", diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json index b82f7ef4a9..e0ee54b6b3 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PET-CF @G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "FusRock Generic PET-CF @G3U 0.6 Nozzle;FusRock Generic PET-CF G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Gyw0XH6UtYQqtgx9", "filament_id": "OFDu1qE7", diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json index 6a224aded2..c886d48276 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock PET-GF", - "inherits": "FusRock PET-CF", "renamed_from": "FusRock Generic PET-GF", + "inherits": "FusRock PET-CF", "from": "system", "setting_id": "ZFIkUVZOklX8jUrT", "filament_id": "OFzwA5Z9", diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json index 80f5577529..8ffe7ef103 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock S-Multi @G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "FusRock Generic S-Multi @G3U 0.6 Nozzle;FusRock Generic S-Multi G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "HvimUHzfNcDRrUBq", "filament_id": "OF0AquDh", diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json index 858da9c1bb..653f47de7c 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FusRock S-PAHT @G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "FusRock Generic S-PAHT @G3U 0.6 Nozzle;FusRock Generic S-PAHT G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "JUiz70mbp7RRSPia", "filament_id": "OFCn83wF", diff --git a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json index 0176ef471f..18dbc7b49c 100644 --- a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic ABS @Flashforge", "renamed_from": "Flashforge Generic ABS @G3U 0.6 Nozzle;Flashforge Generic ABS G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "tzuKCtXYbGw6WB2c", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json index a7cfc16967..0c7fdf561e 100644 --- a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Flashforge", - "inherits": "fdm_filament_abs", "renamed_from": "Flashforge Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "CJXM3PoVEjf4kYnz", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json index 3ecb1b1c67..3213e52e71 100644 --- a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic ASA @Flashforge", "renamed_from": "Flashforge Generic ASA @G3U 0.6 Nozzle;Flashforge Generic ASA G3U 0.6 Nozzle", + "inherits": "Generic ASA @Flashforge", "from": "system", "setting_id": "9wfcw1ifKVGOXx5G", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Flashforge/filament/Generic BVOH @FF C5.json b/resources/profiles/Flashforge/filament/Generic BVOH @FF C5.json index 0e77a94bd8..11ca1a9d74 100644 --- a/resources/profiles/Flashforge/filament/Generic BVOH @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic BVOH @FF C5.json @@ -34,6 +34,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "3.5" ], diff --git a/resources/profiles/Flashforge/filament/Generic BVOH @FF C5P.json b/resources/profiles/Flashforge/filament/Generic BVOH @FF C5P.json index 6679b74a66..b6cd31a55a 100644 --- a/resources/profiles/Flashforge/filament/Generic BVOH @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic BVOH @FF C5P.json @@ -37,6 +37,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "3.5" ], diff --git a/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json index 84c43def44..0948b4b9a8 100644 --- a/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic HIPS @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic ABS @Flashforge", "renamed_from": "Flashforge Generic HIPS @G3U 0.6 Nozzle;Flashforge Generic HIPS G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "wsAmSziSQ4UEHucg", "filament_id": "OFsFon5l", diff --git a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json index 77095049c2..25366c54fb 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "Flashforge Generic PETG @G3U 0.6 Nozzle;Flashforge Generic PETG G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "ptfqxSWRVMFXRqzD", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json index f0ebbde186..f97a46088d 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Flashforge G3U 0.8 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "Flashforge Generic PETG @G3U 0.8 Nozzle;Flashforge Generic PETG G3U 0.8 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "UhrHMgzzppLirT8M", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json index b53946e06c..6cf3196412 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Flashforge", - "inherits": "fdm_filament_pet", "renamed_from": "Flashforge Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "pd9YWgt8IGXdiiUV", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json index a44330253e..85e6d41043 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle;Flashforge Generic PETG-CF G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "xYtwo7Ddkfh5PLIz", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json index 3f5f92e8bc..76d477a95e 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Flashforge G3U 0.8 Nozzle", - "inherits": "Generic PETG @Flashforge", "renamed_from": "Flashforge Generic PETG-CF @G3U 0.8 Nozzle;Flashforge Generic PETG-CF G3U 0.8 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "v3HCxK10mQARiRTZ", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Flashforge/filament/Generic PLA @FF C5.json b/resources/profiles/Flashforge/filament/Generic PLA @FF C5.json index 12f0d129bc..df25efccb9 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @FF C5.json @@ -49,6 +49,9 @@ "filament_cooling_moves": [ "2" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_loading_speed": [ "10" ], diff --git a/resources/profiles/Flashforge/filament/Generic PLA @FF C5P.json b/resources/profiles/Flashforge/filament/Generic PLA @FF C5P.json index 0f9ccae55c..e7e3e0d186 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @FF C5P.json @@ -43,6 +43,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "18" ], diff --git a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json index 2a7b642470..8c8984059c 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Flashforge", - "inherits": "fdm_filament_pla", "renamed_from": "Flashforge Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "keWbSonGBWos68ag", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json index 2087257bcb..18e926c6b1 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json @@ -40,6 +40,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "12" ], diff --git a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json index a5de4c8f4a..f2987ca9bf 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json @@ -43,6 +43,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "12" ], diff --git a/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json index af864f7f8e..cb0f27a120 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", - "inherits": "Generic PLA @Flashforge", "renamed_from": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle;Flashforge Generic PLA-CF G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "3vXm1hn43igE1xww", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json index 798dff9458..9b43dfadac 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Flashforge G3U 0.8 Nozzle", - "inherits": "Generic PLA @Flashforge", "renamed_from": "Flashforge Generic PLA-CF @G3U 0.8 Nozzle;Flashforge Generic PLA-CF G3U 0.8 Nozzle", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "f1rqvqunGS94fw7q", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json b/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json index d8eabacaa0..f831b9b690 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-Silk @Flashforge", - "inherits": "fdm_filament_pla", "renamed_from": "Flashforge Generic PLA-Silk", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "TPRkxgDXxVhPC1ws", "filament_id": "OFi6PfUM", diff --git a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json index d34dc09ee4..ffd86b3f25 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json @@ -41,6 +41,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json index 7b90c39711..499a3b0658 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json @@ -44,6 +44,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json index de84158ff1..4e57706c46 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json @@ -41,6 +41,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json index dae60389c1..597b919fbe 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json @@ -44,6 +44,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json index 66f0535b0b..9f7dcd3e03 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json @@ -41,6 +41,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json index f44c131661..eaa6eacd93 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json @@ -44,6 +44,9 @@ "fan_min_speed": [ "70" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "1.02" ], diff --git a/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json index 285af63564..95de8ab8b2 100644 --- a/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json +++ b/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json @@ -5,10 +5,10 @@ "from": "system", "setting_id": "OB4I8nwZn8sCcCcF", "filament_id": "OF20zavY", + "instantiation": "true", "filament_vendor": [ "Kexcelled" ], - "instantiation": "true", "cool_plate_temp": [ "40" ], diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series 0.6 nozzle.json index 357e50666a..fe24c8c825 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series 0.6 nozzle.json @@ -22,9 +22,11 @@ ], "host_type": "flashforge", "machine_max_acceleration_extruding": [ + "5000", "5000" ], "machine_max_speed_z": [ + "30", "30" ] } diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.25 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.25 nozzle.json index c3cb7aa570..3f49f72c9e 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.25 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.25 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.4 nozzle.json index 474e697fa1..bb59171e96 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.4 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.6 nozzle.json index a10c65d83e..21aee9e9a1 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.6 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.8 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.8 nozzle.json index 0e3a29a2ad..1e4a9ced6c 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.8 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 0.8 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.25 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.25 nozzle.json index 911c09f29c..5faaefa754 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.25 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.25 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.4 nozzle.json index ec69837a3a..644248c9af 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.4 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.6 nozzle.json index d3d189d4e9..4a6f4db2f8 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.6 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.8 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.8 nozzle.json index e596675ad0..bcd21f54e9 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.8 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro 0.8 nozzle.json @@ -70,66 +70,162 @@ "machine_end_gcode": ";end_gcode\nG1 X150 Y150 E-1.2 F12000", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_x": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_y": [ + "30000", + "20000", + "30000", + "20000", + "30000", + "20000", "30000", "20000" ], "machine_max_acceleration_z": [ + "300", + "500", + "300", + "500", + "300", + "500", "300", "500" ], "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", + "3", + "3", + "3", + "3", "3", "3" ], "machine_max_junction_deviation": [ + "0", + "0", + "0", + "0", + "0", + "0", "0", "0" ], "machine_max_speed_e": [ + "30", + "30", + "30", + "30", + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_y": [ + "600", + "600", + "600", + "600", + "600", + "600", "600", "600" ], "machine_max_speed_z": [ + "20", + "20", + "20", + "20", + "20", + "20", "20", "20" ], @@ -168,8 +264,18 @@ ], "nozzle_height": "4", "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", - "nozzle_volume": "0", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], + "nozzle_volume": [ + "0", + "0", + "0", + "0" + ], "parking_pos_retraction": "0", "pellet_modded_printer": "0", "preferred_orientation": "0", diff --git a/resources/profiles/FlyingBear.json b/resources/profiles/FlyingBear.json index 8c09e115e2..04dac46c58 100644 --- a/resources/profiles/FlyingBear.json +++ b/resources/profiles/FlyingBear.json @@ -1,6 +1,6 @@ { "name": "FlyingBear", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "1", "description": "FlyingBear configurations", "machine_model_list": [ diff --git a/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json index b0de37a64b..c35e6def0c 100644 --- a/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @FlyingBear", - "inherits": "fdm_filament_abs", "renamed_from": "FlyingBear Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "2aW5bka7pvQhHGqF", "filament_id": "OFY9muEs", diff --git a/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json index 37448910ed..6a21bf1f04 100644 --- a/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @FlyingBear", - "inherits": "fdm_filament_pa", "renamed_from": "FlyingBear Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "5hw49IVGTMbie2Zr", "filament_id": "OFQLcbps", diff --git a/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json index 926494718b..91a4def417 100644 --- a/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @FlyingBear", - "inherits": "fdm_filament_pc", "renamed_from": "FlyingBear Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "HU6kkNtEXGubYV0U", "filament_id": "OFLakOUI", diff --git a/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json index 77079afc33..c14cb5258f 100644 --- a/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @FlyingBear", - "inherits": "fdm_filament_pet", "renamed_from": "FlyingBear Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "D5Zk6ykY8TX3gs0Z", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json index 159f3da22b..b62cae5202 100644 --- a/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @FlyingBear", - "inherits": "fdm_filament_pla", "renamed_from": "FlyingBear Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "g7zPgD6P3bbwm5gv", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json b/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json index c33b3757be..8b462ad936 100644 --- a/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json +++ b/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @FlyingBear", - "inherits": "fdm_filament_tpu", "renamed_from": "FlyingBear Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "Xdx2FIIQiqSz7DpN", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json index 85a926f7e9..01adb95891 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "FlyingBear PLA Basic @Ghost7", - "inherits": "fdm_filament_pla @Ghost7", "renamed_from": "FlyingBear PLA @Ghost7", + "inherits": "fdm_filament_pla @Ghost7", "from": "system", "setting_id": "3JBTG6IDrBCnvIhf", "filament_id": "OF3fwO8b", diff --git a/resources/profiles/InfiMech.json b/resources/profiles/InfiMech.json index 78c54e0b4d..fb8e63b962 100644 --- a/resources/profiles/InfiMech.json +++ b/resources/profiles/InfiMech.json @@ -1,6 +1,6 @@ { "name": "InfiMech", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "1", "description": "InfiMech configurations", "machine_model_list": [ diff --git a/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json b/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json index 80b479de75..305a441fac 100644 --- a/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @InfiMech", - "inherits": "fdm_filament_abs", "renamed_from": "InfiMech Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "HRLECASD9Ko4Xxof", "filament_id": "OFY9muEs", diff --git a/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json b/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json index 0c202c609c..162e322696 100644 --- a/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @InfiMech", - "inherits": "fdm_filament_pa", "renamed_from": "InfiMech Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "IRYJpvGGjpF4ofY1", "filament_id": "OFQLcbps", diff --git a/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json b/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json index a37d5db2b7..ca98f3db10 100644 --- a/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @InfiMech", - "inherits": "fdm_filament_pc", "renamed_from": "InfiMech Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "W0oujcCps06G6yNB", "filament_id": "OFLakOUI", diff --git a/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json b/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json index 55162d9852..f57df9a1fc 100644 --- a/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @InfiMech", - "inherits": "fdm_filament_pet", "renamed_from": "InfiMech Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "sAi8oKez7NGKo1wy", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json b/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json index 4d2d7dc402..fecad691df 100644 --- a/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @InfiMech", - "inherits": "fdm_filament_pla", "renamed_from": "InfiMech Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "tdnlzJyNB6zpQS8w", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json b/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json index bc2b0c37a8..58e7605d3e 100644 --- a/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json +++ b/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @InfiMech", - "inherits": "fdm_filament_tpu", "renamed_from": "InfiMech Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "kK1S7YP8vgTJeFPO", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/LH.json b/resources/profiles/LH.json index 09e5d17e35..43d0afc572 100644 --- a/resources/profiles/LH.json +++ b/resources/profiles/LH.json @@ -1,7 +1,7 @@ { "name": "LH", "url": "https://github.com/lhndo/LH-Stinger", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "LH 3D Printer Configuration", "machine_model_list": [ diff --git a/resources/profiles/LH/filament/LHS ABS.json b/resources/profiles/LH/filament/LHS ABS.json index 2e7ee48e32..f31f1c0392 100644 --- a/resources/profiles/LH/filament/LHS ABS.json +++ b/resources/profiles/LH/filament/LHS ABS.json @@ -1,11 +1,11 @@ { - "name": "LHS ABS", "type": "filament", - "filament_id": "OFztQ7rO", - "setting_id": "EQxNYC7BdGEA2iiD", - "from": "system", - "instantiation": "true", + "name": "LHS ABS", "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "EQxNYC7BdGEA2iiD", + "filament_id": "OFztQ7rO", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -352,4 +352,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS ASA.json b/resources/profiles/LH/filament/LHS ASA.json index 4cc096cb90..8495669ef7 100644 --- a/resources/profiles/LH/filament/LHS ASA.json +++ b/resources/profiles/LH/filament/LHS ASA.json @@ -1,11 +1,11 @@ { - "name": "LHS ASA", - "filament_id": "OFaP2SsH", - "setting_id": "hoq5bKHUb9DE1ezj", "type": "filament", - "from": "system", - "instantiation": "true", + "name": "LHS ASA", "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "hoq5bKHUb9DE1ezj", + "filament_id": "OFaP2SsH", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS PCTG.json b/resources/profiles/LH/filament/LHS PCTG.json index 2f2a7d2fd6..515158064f 100644 --- a/resources/profiles/LH/filament/LHS PCTG.json +++ b/resources/profiles/LH/filament/LHS PCTG.json @@ -1,11 +1,11 @@ { - "name": "LHS PCTG", "type": "filament", - "filament_id": "OFBJAdLw", - "setting_id": "dKWttiAQNwymKsIC", - "from": "system", - "instantiation": "true", + "name": "LHS PCTG", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "dKWttiAQNwymKsIC", + "filament_id": "OFBJAdLw", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS PETG.json b/resources/profiles/LH/filament/LHS PETG.json index 2956267dab..88893460dd 100644 --- a/resources/profiles/LH/filament/LHS PETG.json +++ b/resources/profiles/LH/filament/LHS PETG.json @@ -1,11 +1,11 @@ { - "name": "LHS PETG", "type": "filament", - "filament_id": "OFRJ325z", - "setting_id": "aZdY1M44ui7Rtj8r", - "from": "system", - "instantiation": "true", + "name": "LHS PETG", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "aZdY1M44ui7Rtj8r", + "filament_id": "OFRJ325z", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS PLA.json b/resources/profiles/LH/filament/LHS PLA.json index 87ef788b7d..d52996d0a9 100644 --- a/resources/profiles/LH/filament/LHS PLA.json +++ b/resources/profiles/LH/filament/LHS PLA.json @@ -1,11 +1,11 @@ { - "name": "LHS PLA", "type": "filament", - "filament_id": "OFyoBZdm", - "setting_id": "M8WSwqD1iQkQntpy", - "from": "system", - "instantiation": "true", + "name": "LHS PLA", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "M8WSwqD1iQkQntpy", + "filament_id": "OFyoBZdm", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS TPU Foamy 78A.json b/resources/profiles/LH/filament/LHS TPU Foamy 78A.json index 3be659400a..db9a24428a 100644 --- a/resources/profiles/LH/filament/LHS TPU Foamy 78A.json +++ b/resources/profiles/LH/filament/LHS TPU Foamy 78A.json @@ -1,11 +1,11 @@ { - "name": "LHS TPU Foamy 78A", "type": "filament", - "filament_id": "OFngcE81", - "setting_id": "FWyg21qHmAKeihMn", - "from": "system", - "instantiation": "true", + "name": "LHS TPU Foamy 78A", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "FWyg21qHmAKeihMn", + "filament_id": "OFngcE81", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LH/filament/LHS TPU.json b/resources/profiles/LH/filament/LHS TPU.json index f503425bd4..6c6fd5cf99 100644 --- a/resources/profiles/LH/filament/LHS TPU.json +++ b/resources/profiles/LH/filament/LHS TPU.json @@ -1,11 +1,11 @@ { - "name": "LHS TPU", "type": "filament", - "filament_id": "OFIZMQwM", - "setting_id": "ILgpZYIqYGH6mqdI", - "from": "system", - "instantiation": "true", + "name": "LHS TPU", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "ILgpZYIqYGH6mqdI", + "filament_id": "OFIZMQwM", + "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", "LH Stinger MMU 0.4 nozzle" @@ -349,4 +349,4 @@ "volumetric_speed_coefficients": [ "" ] -} \ No newline at end of file +} diff --git a/resources/profiles/LONGER.json b/resources/profiles/LONGER.json index b4d6c3a1fb..7ce53329e1 100644 --- a/resources/profiles/LONGER.json +++ b/resources/profiles/LONGER.json @@ -1,6 +1,6 @@ { "name": "LONGER", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "LONGER configurations", "machine_model_list": [ diff --git a/resources/profiles/LONGER/machine/LONGER LK10 (0.2 nozzle).json b/resources/profiles/LONGER/machine/LONGER LK10 (0.2 nozzle).json index 93a11e4a66..71b70e7fc8 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10 (0.2 nozzle).json +++ b/resources/profiles/LONGER/machine/LONGER LK10 (0.2 nozzle).json @@ -33,36 +33,47 @@ ], "thumbnails_format": "PNG", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "10000", "10000" ], "machine_max_acceleration_travel": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", "10000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ] } diff --git a/resources/profiles/LONGER/machine/LONGER LK10 (0.4 nozzle).json b/resources/profiles/LONGER/machine/LONGER LK10 (0.4 nozzle).json index ce8f8b9580..5073e5e3c2 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10 (0.4 nozzle).json +++ b/resources/profiles/LONGER/machine/LONGER LK10 (0.4 nozzle).json @@ -33,36 +33,47 @@ ], "thumbnails_format": "PNG", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "10000", "10000" ], "machine_max_acceleration_travel": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", "10000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ] } diff --git a/resources/profiles/LONGER/machine/LONGER LK10 (0.6 nozzle).json b/resources/profiles/LONGER/machine/LONGER LK10 (0.6 nozzle).json index a99639d18d..9dee6b44a9 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10 (0.6 nozzle).json +++ b/resources/profiles/LONGER/machine/LONGER LK10 (0.6 nozzle).json @@ -33,36 +33,47 @@ ], "thumbnails_format": "PNG", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "10000", "10000" ], "machine_max_acceleration_travel": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", "10000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ] } diff --git a/resources/profiles/LONGER/machine/LONGER LK10 (0.8 nozzle).json b/resources/profiles/LONGER/machine/LONGER LK10 (0.8 nozzle).json index 0493d30520..222e47453e 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10 (0.8 nozzle).json +++ b/resources/profiles/LONGER/machine/LONGER LK10 (0.8 nozzle).json @@ -33,36 +33,47 @@ ], "thumbnails_format": "PNG", "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "10000", "10000" ], "machine_max_acceleration_travel": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "10000", "10000" ], "machine_max_acceleration_y": [ + "10000", "10000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "12", "12" ] } diff --git a/resources/profiles/Lulzbot.json b/resources/profiles/Lulzbot.json index 39042cbe9a..5f0eb2a917 100644 --- a/resources/profiles/Lulzbot.json +++ b/resources/profiles/Lulzbot.json @@ -1,7 +1,7 @@ { "name": "Lulzbot", "url": "https://ohai.lulzbot.com/group/taz-6/", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Lulzbot configurations", "machine_model_list": [ diff --git a/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json index 1e5c2163f1..63f59fcbb9 100644 --- a/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json +++ b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json @@ -11,6 +11,9 @@ "filament_density": [ "1.06" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], diff --git a/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json index 95d8a2274c..e7590dc5f8 100644 --- a/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json +++ b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json @@ -1,14 +1,17 @@ { "type": "filament", "name": "Generic ABS @Lulzbot", - "inherits": "Generic ABS @System", "renamed_from": "Lulzbot 2.85mm ABS", + "inherits": "Generic ABS @System", "from": "system", "setting_id": "Mtn4Fh3Lp6KlAxjo", "instantiation": "true", "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], diff --git a/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json index bfddec7add..5b7bf6a70e 100644 --- a/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json +++ b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json @@ -11,6 +11,9 @@ "filament_density": [ "1.24" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], diff --git a/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json index 825df8bdc8..3a45b4f117 100644 --- a/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json +++ b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json @@ -1,14 +1,17 @@ { "type": "filament", "name": "Generic PETG @Lulzbot", - "inherits": "Generic PETG @System", "renamed_from": "Lulzbot 2.85mm PETG", + "inherits": "Generic PETG @System", "from": "system", "setting_id": "dqj6O9NIPAaq8wWz", "instantiation": "true", "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], diff --git a/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json index 07cae7accc..3a0a3f5549 100644 --- a/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json +++ b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json @@ -11,6 +11,9 @@ "filament_density": [ "1.25" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "8" ], diff --git a/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json index d08d72ee53..29dae86c0e 100644 --- a/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json +++ b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json @@ -1,14 +1,17 @@ { "type": "filament", "name": "Generic PLA @Lulzbot", - "inherits": "Generic PLA @System", "renamed_from": "Lulzbot 2.85mm PLA", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "3evRjso1wNxd9nV3", "instantiation": "true", "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "8" ], diff --git a/resources/profiles/M3D.json b/resources/profiles/M3D.json index a4231e878e..9140a8797b 100644 --- a/resources/profiles/M3D.json +++ b/resources/profiles/M3D.json @@ -1,6 +1,6 @@ { "name": "M3D", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Configuration for M3D printers", "machine_model_list": [ diff --git a/resources/profiles/M3D/machine/M3D Enabler D7500 0.4 nozzle.json b/resources/profiles/M3D/machine/M3D Enabler D7500 0.4 nozzle.json index 9888c656b8..ad15070b64 100644 --- a/resources/profiles/M3D/machine/M3D Enabler D7500 0.4 nozzle.json +++ b/resources/profiles/M3D/machine/M3D Enabler D7500 0.4 nozzle.json @@ -32,27 +32,35 @@ "machine_end_gcode": "M104 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG1 X0 Y140\nG1 Y150 F4000\nM18 X Y E\nM18 S36000", "machine_load_filament_time": "0.5", "machine_max_acceleration_e": [ + "10000", "10000" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "400", "400" ], "machine_max_speed_e": [ + "30", "30" ], "machine_max_speed_x": [ + "60", "60" ], "machine_max_speed_y": [ + "60", "60" ], "machine_max_speed_z": [ + "12", "12" ], "machine_start_gcode": "M104 S{first_layer_temperature[0]} ; Begin Heating\n\nG91 ; Relative coordinates\nG1 Z10 ; Lift the head abit\nG90 ; Back to absolute coordinates\nG28 ; Home All\nG1 Z10 F500 ; Dont want to burn the bed while heating\nM109 S{first_layer_temperature[0]} ; Wait for pre-heat\n; Prime the extruder\nG92 E0 ; Set Extruder position to be 0\nG1 E5 F100 ; Extrude a bit in the air\nG1 X0 Y5 Z0.1 F500 ; Touch Down\nG92 E0 ; Set Extruder position to be 0\nG1 X100 Z0.3 E10 F500 ; Nozzle wipe\nG92 E0 ; Set Extruder position to be 0", diff --git a/resources/profiles/M3D/machine/M3D Enabler D8500 0.4 nozzle.json b/resources/profiles/M3D/machine/M3D Enabler D8500 0.4 nozzle.json index e57e6aeb8e..ee54cae8e5 100644 --- a/resources/profiles/M3D/machine/M3D Enabler D8500 0.4 nozzle.json +++ b/resources/profiles/M3D/machine/M3D Enabler D8500 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "machine", "name": "M3D Enabler D8500 0.4 nozzle", - "inherits": "fdm_machine_common", "renamed_from": "M3D Enabler D8500 MM", + "inherits": "fdm_machine_common", "from": "system", "setting_id": "xdGprcdFiVkG5vT2", "instantiation": "true", @@ -37,34 +37,50 @@ "machine_end_gcode": "; ===== ORCA END GCODE =====\nM400\nM83\nG92 E0\nG1 E-17 F1800 ; retract BEFORE any moves or power changes\n\n; Now lift and park\nG91\nG1 Z2 F2000\nG90\nG1 X100 Y160 F3000 ; parking point\n\n; Power down in order\nM104 T0 S0\nM104 T1 S0\nM106 S50 ; keep fan at ~50% while cooling (adjust if desired)\n; (Leave steppers on by omitting M84)\n; ===== END ORCA END GCODE =====\n", "machine_load_filament_time": "0.5", "machine_max_acceleration_e": [ + "10000", + "10000", "10000", "10000" ], "machine_max_acceleration_x": [ + "2000", + "2000", "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", + "2000", "2000", "2000" ], "machine_max_acceleration_z": [ + "400", + "400", "400", "400" ], "machine_max_speed_e": [ + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "400", + "400", "400", "400" ], "machine_max_speed_y": [ + "300", + "300", "300", "300" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], @@ -86,7 +102,10 @@ "0.4", "0.4" ], - "nozzle_type": "brass", + "nozzle_type": [ + "brass", + "brass" + ], "print_host": "m3d-enabler.local", "printable_area": [ "0x0", diff --git a/resources/profiles/M3D/process/0.15mm Standard @M3D Enabler D8500.json b/resources/profiles/M3D/process/0.15mm Standard @M3D Enabler D8500.json index 10c103af8d..a1e96478ed 100644 --- a/resources/profiles/M3D/process/0.15mm Standard @M3D Enabler D8500.json +++ b/resources/profiles/M3D/process/0.15mm Standard @M3D Enabler D8500.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.15mm Standard @M3D Enabler D8500", - "inherits": "fdm_process_common", "renamed_from": "0.15mm MM @D8500", + "inherits": "fdm_process_common", "from": "system", "setting_id": "69ArGbue7nQ5gO2r", "instantiation": "true", diff --git a/resources/profiles/M3D/process/0.20mm Standard @M3D Enabler D8500.json b/resources/profiles/M3D/process/0.20mm Standard @M3D Enabler D8500.json index dabf8c2dd0..1b24b64d8b 100644 --- a/resources/profiles/M3D/process/0.20mm Standard @M3D Enabler D8500.json +++ b/resources/profiles/M3D/process/0.20mm Standard @M3D Enabler D8500.json @@ -1,8 +1,8 @@ { "type": "process", "name": "0.20mm Standard @M3D Enabler D8500", - "inherits": "fdm_process_common", "renamed_from": "0.20mm MM @D8500", + "inherits": "fdm_process_common", "from": "system", "setting_id": "gg3RzTI5TgWRX2Hh", "instantiation": "true", diff --git a/resources/profiles/MagicMaker.json b/resources/profiles/MagicMaker.json index 08e5774547..f223b51f10 100644 --- a/resources/profiles/MagicMaker.json +++ b/resources/profiles/MagicMaker.json @@ -1,6 +1,6 @@ { "name": "MagicMaker", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "MagicMaker configurations", "machine_model_list": [ diff --git a/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json b/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json index 6915058856..101f4049e4 100644 --- a/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json +++ b/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PEEK @MM", - "inherits": "fdm_filament_peek", "renamed_from": "MM Generic PEEK", + "inherits": "fdm_filament_peek", "from": "system", "setting_id": "2xiVNAQTwBaiLjJn", "filament_id": "OFz5oHgf", diff --git a/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json index 91054a666d..1ff55a7702 100644 --- a/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json @@ -76,6 +76,7 @@ "Generic PLA @System" ], "machine_max_acceleration_e": [ + "10000", "10000" ], "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json index c1b219aae0..ef1cd2354c 100644 --- a/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json @@ -51,6 +51,7 @@ "extruder_clearance_height_to_rod": "32", "extruder_clearance_radius": "50", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_speed_e": [ diff --git a/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json index fdfc49385a..6dff59135f 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json @@ -49,6 +49,7 @@ "extruder_clearance_height_to_rod": "32", "extruder_clearance_radius": "50", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_speed_e": [ diff --git a/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json index 9760c8382b..8e147c5284 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json @@ -60,6 +60,7 @@ "extruder_clearance_height_to_rod": "32", "extruder_clearance_radius": "50", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_speed_e": [ diff --git a/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json index 7c71afe855..fd64db2ef7 100644 --- a/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json @@ -49,6 +49,7 @@ "extruder_clearance_height_to_rod": "32", "extruder_clearance_radius": "50", "machine_max_acceleration_e": [ + "4000", "4000" ], "machine_max_speed_e": [ diff --git a/resources/profiles/Meltingplot.json b/resources/profiles/Meltingplot.json index 654d955380..78277c2966 100644 --- a/resources/profiles/Meltingplot.json +++ b/resources/profiles/Meltingplot.json @@ -1,6 +1,6 @@ { "name": "Meltingplot", - "version": "02.04.00.00", + "version": "02.04.00.01", "force_update": "0", "description": "Meltingplot configurations", "machine_model_list": [ diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json index 1f759767fa..d0e99e29e7 100644 --- a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "AL4mb7soA7L0FKTb", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "10" ], diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json index c7984aa06d..0d4a82630a 100644 --- a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "OCnoqOQbcfgikNmA", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "15" ], diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json index a28a1feca0..7a416adeb2 100644 --- a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "HO2NCV1i1l21mokh", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "20" ], diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json index 545acdf113..afe41dfb47 100644 --- a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "dRH4HfWHQPwo33cP", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "25" ], diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json index b9f864f79f..6ef4a397b2 100644 --- a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json @@ -6,6 +6,9 @@ "setting_id": "qmPRaTcPlmtk6zB2", "filament_id": "OF1PznHI", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Extrudr" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json index 837e55a36f..d5838a8bbc 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "NjuuWYHSc7IlwWAy", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "11" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json index d73964b709..add93bc87d 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "md24RPsRyxBhGRoW", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "16" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json index 82c5ed8935..c5e7bcb0ca 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "Y2LYeWL7Zxel3m0c", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json index a74a3a1925..e69535f635 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "G2UYPHTEWjun65jj", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "27" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS.json index c947cd55e9..391c1b2233 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ABS.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS.json @@ -6,6 +6,9 @@ "setting_id": "zVQixgSSn1jm1c7n", "filament_id": "OFVIMei2", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json index f567231b8d..4257ef5d1e 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "4EBXMyiXoLrw5rLC", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "11" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json index 96553662a8..82313a70a6 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "2UdzXwYGT5nqtcdK", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "16" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json index 9e6d846c7f..92e4fb5ad2 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "4hk1aKrMkppVYH4z", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json index e8bc7d7a32..6f69297c3f 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "JRSnSdwkvrQx8uH8", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "27" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA.json index 180ef14e39..908fef6e95 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot ASA.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA.json @@ -6,6 +6,9 @@ "setting_id": "5VuPxdOXfTIidM4X", "filament_id": "OFRdywGp", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json index 5fd012ed93..ee4e17948e 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "yUlzU6KMVx8bpxj1", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "7" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json index 4ece916d20..a07615dfd6 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "9XzYyYbJ4jnO4nhJ", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "11" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json index b1b4d489f8..edd3918a77 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "BMbLehqxegpSvMci", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "15" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json index b2ab6f3cf5..197bf260b4 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "7R3XuQlzD8IHq4PZ", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "18" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json index 6b2852b4b2..f1a9f8f3d4 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json @@ -6,6 +6,9 @@ "setting_id": "kzlYLTM6H5CgpQ8y", "filament_id": "OFdPevOo", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json index f828906a7c..e3696dd899 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "2fkQa1BwTGZbSi2z", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "10" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json index 11b9bb2550..c2d529b818 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "PcNAj2kwuUNBAjQE", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "16" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json index 20039024ce..91e9f9aef8 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "70EwKatuncZBKgoD", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "21" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json index 9913b5f812..7995a32bfa 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "X2yhWBjK4j46bUYW", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "26" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json index f932be9d05..4166040fad 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json @@ -6,6 +6,9 @@ "setting_id": "IdqfEh7xRXKTYmV3", "filament_id": "OFJdf5nt", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json index 55df65bb99..edef02255f 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "2ohDGd34awK2DVbV", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "9" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json index 5d77c69c8f..fc5cd4fc2d 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "DZe1WokuOM5byttU", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "14" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json index 4e5f16b411..699bb146a2 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "LwFY7N8Uisy6ivOV", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "18" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json index cdc4620078..87129aae8e 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "kR8Vbizk0CPciCbD", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "23" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG.json index d6ed4e25cb..f6085221b2 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PETG.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG.json @@ -6,6 +6,9 @@ "setting_id": "dsW7JrzWhKAY1fey", "filament_id": "OFvlreVF", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json index 4ec8bc1fb5..70794f0c92 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "T3OEfrhyZ6ISyv20", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "11" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json index 054bc03ab6..17bc575326 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "hsgzwjPc26BJ4sQu", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "16" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json index 7fa45fc182..21860142a0 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "cz6RkfsQ0hJE0hYG", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json index bbb19233db..f7d2138e9c 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "H3n0VPl3CymiK9VN", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "27" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA.json index 60575e7aa6..d6eaeebaed 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot PLA.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA.json @@ -6,6 +6,9 @@ "setting_id": "ONpaHlfJVJyh7Shb", "filament_id": "OFwXRVbB", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json index 6804806002..96c2e1a130 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "i5ttRpqpqF3Kg8IF", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "11" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json index a80febac3f..766ac02cc6 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "Vbm6NJb4il6QAU6v", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "16" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json index 3815b36da9..df6e98bf92 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "jYrElhVPtK2Dpb9K", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json index 51ccd444e2..b9e3adad88 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json @@ -5,6 +5,9 @@ "from": "system", "setting_id": "lQDEFxTsxFsT5A4n", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "27" ], diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json index 5082e6e19e..f3ae8c8a23 100644 --- a/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json @@ -6,6 +6,9 @@ "setting_id": "LDPRmxlvX97NXF0F", "filament_id": "OFyYfgDM", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Meltingplot" ], diff --git a/resources/profiles/OpenEYE.json b/resources/profiles/OpenEYE.json index 36f4ae9fac..07ba99b088 100644 --- a/resources/profiles/OpenEYE.json +++ b/resources/profiles/OpenEYE.json @@ -1,7 +1,7 @@ { "name": "OpenEYE", "url": "http://www.openeye.tech", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "OpenEYE Printers Configurations", "machine_model_list": [ diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json index 8a3ce9de77..591bb61c09 100644 --- a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json @@ -1,9 +1,12 @@ { + "type": "machine", + "name": "OpenEYE Peacock V2 0.4 nozzle", + "inherits": "fdm_openeye_common", + "from": "system", + "setting_id": "iJqPJqKBFJvagyMn", + "instantiation": "true", "default_print_profile": "0.20mm Standard @OpenEYE Peacock V2", "default_bed_type": "Textured PEI Plate", - "from": "system", - "inherits": "fdm_openeye_common", - "instantiation": "true", "adaptive_bed_mesh_margin": "10", "bed_mesh_max": "211,211", "bed_mesh_min": "1.5,7", @@ -29,7 +32,6 @@ "machine_pause_gcode": "PAUSE", "machine_start_gcode": "SET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nMMU_START_SETUP INITIAL_TOOL={initial_tool} TOTAL_TOOLCHANGES=!total_toolchanges! REFERENCED_TOOLS=!referenced_tools! TOOL_COLORS=!colors! TOOL_TEMPS=!temperatures! TOOL_MATERIALS=!materials! FILAMENT_NAMES=!filament_names! PURGE_VOLUMES=!purge_volumes!\nMMU_START_CHECK\nSTART_PRINT BED_TEMP=[bed_temperature_initial_layer] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TYPE=\"{curr_bed_type}\" MESH_MIN={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} MESH_MAX={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE_MARGIN={adaptive_bed_mesh_margin}\n; Enter YOUR exist start_print macro call here (minus purging logic because tool may not be loaded yet)\nMMU_START_LOAD_INITIAL_TOOL\n; Optionally add YOUR additional start logic (like purging) here to run just prior to start\nSTART_PRINT_SECONDARY\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} ; For pause at layer functionality and better print stats", "machine_unload_filament_time": "30", - "name": "OpenEYE Peacock V2 0.4 nozzle", "nozzle_diameter": [ "0.4" ], @@ -43,9 +45,6 @@ "printer_model": "OpenEYE Peacock V2", "printer_variant": "0.4", "retract_lift_below": [ - "180", "180" - ], - "setting_id": "iJqPJqKBFJvagyMn", - "type": "machine" + ] } diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json index 9bb97fb232..582bd47577 100644 --- a/resources/profiles/OrcaArena.json +++ b/resources/profiles/OrcaArena.json @@ -1,7 +1,7 @@ { "name": "Orca Arena Printer", "url": "", - "version": "02.04.00.07", + "version": "02.04.00.08", "force_update": "0", "description": "Orca Arena configuration files", "machine_model_list": [ diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json index f98408fe0f..06fafc1e6d 100644 --- a/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @OrcaArena 0.2 nozzle", - "inherits": "Generic ABS @OrcaArena base", "renamed_from": "OrcaArena Generic ABS @0.2 nozzle;OrcaArena Generic ABS 0.2 nozzle", + "inherits": "Generic ABS @OrcaArena base", "from": "system", "setting_id": "mzx0hG9Xe9fIrkrW", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json index 2a505d7ca1..3cdcc432e7 100644 --- a/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @OrcaArena", - "inherits": "Generic ABS @OrcaArena base", "renamed_from": "OrcaArena Generic ABS", + "inherits": "Generic ABS @OrcaArena base", "from": "system", "setting_id": "ftTPQmVmsaD0n1GF", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json index 77bd051b4e..dfa3a1c768 100644 --- a/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @OrcaArena 0.2 nozzle", - "inherits": "Generic ASA @OrcaArena base", "renamed_from": "OrcaArena Generic ASA @0.2 nozzle;OrcaArena Generic ASA 0.2 nozzle", + "inherits": "Generic ASA @OrcaArena base", "from": "system", "setting_id": "rtFj6gFceWHdzTmO", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json index 0ee8d6cc20..5566524b6b 100644 --- a/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @OrcaArena", - "inherits": "Generic ASA @OrcaArena base", "renamed_from": "OrcaArena Generic ASA", + "inherits": "Generic ASA @OrcaArena base", "from": "system", "setting_id": "V2Z1rxHqIqIuwP5O", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json index 87b0a67ed8..bd158cb214 100644 --- a/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @OrcaArena", - "inherits": "fdm_filament_pa", "renamed_from": "OrcaArena Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "KScdeqdB3UR6uvxs", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json index 2d928201b7..725379b2b2 100644 --- a/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @OrcaArena", - "inherits": "fdm_filament_pa", "renamed_from": "OrcaArena Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "xANIesGhsXwbTn3J", "filament_id": "OFQLcbps", diff --git a/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json index ad15f49a69..cfad14e592 100644 --- a/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @OrcaArena 0.2 nozzle", - "inherits": "Generic PC @OrcaArena base", "renamed_from": "OrcaArena Generic PC @0.2 nozzle;OrcaArena Generic PC 0.2 nozzle", + "inherits": "Generic PC @OrcaArena base", "from": "system", "setting_id": "AEKvB4RVBo2zOkdg", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json index b4302c3c47..8d912f314d 100644 --- a/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @OrcaArena", - "inherits": "Generic PC @OrcaArena base", "renamed_from": "OrcaArena Generic PC", + "inherits": "Generic PC @OrcaArena base", "from": "system", "setting_id": "He4O4h8oEFsySDIJ", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json index 1be2988356..f61bd4a93c 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @OrcaArena 0.2 nozzle", - "inherits": "Generic PETG @OrcaArena base", "renamed_from": "OrcaArena Generic PETG @0.2 nozzle;OrcaArena Generic PETG 0.2 nozzle", + "inherits": "Generic PETG @OrcaArena base", "from": "system", "setting_id": "ZstQ3h8DGCpRWQJN", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json index ad3260fe1c..1535697b43 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @OrcaArena", - "inherits": "Generic PETG @OrcaArena base", "renamed_from": "OrcaArena Generic PETG", + "inherits": "Generic PETG @OrcaArena base", "from": "system", "setting_id": "3puaC0EwFLvEnGH2", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json index f8741a22a9..464391a198 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json +++ b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Arena X1C", - "inherits": "Generic PETG-CF @OrcaArena base", "renamed_from": "OrcaArena Generic PETG-CF @Arena X1C;OrcaArena Generic PETG-CF Arena X1C", + "inherits": "Generic PETG-CF @OrcaArena base", "from": "system", "setting_id": "MeIL8qLFZytjvYrF", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json index 074732db01..03561223e1 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @OrcaArena 0.2 nozzle", - "inherits": "Generic PLA @OrcaArena base", "renamed_from": "OrcaArena Generic PLA @0.2 nozzle;OrcaArena Generic PLA 0.2 nozzle", + "inherits": "Generic PLA @OrcaArena base", "from": "system", "setting_id": "HjJH9JT9x9sFtVES", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json index 9018f24583..df02e7a649 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @OrcaArena", - "inherits": "Generic PLA @OrcaArena base", "renamed_from": "OrcaArena Generic PLA", + "inherits": "Generic PLA @OrcaArena base", "from": "system", "setting_id": "TfkkCc6rILxDiZhR", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json index 6afb0e48a2..69fbf67886 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @OrcaArena", - "inherits": "Generic PLA Silk @OrcaArena base", "renamed_from": "OrcaArena Generic PLA Silk", + "inherits": "Generic PLA Silk @OrcaArena base", "from": "system", "setting_id": "rvJjX9QsHM1O1CGD", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json index ced9245904..6e5423f31b 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @OrcaArena", - "inherits": "Generic PLA-CF @OrcaArena base", "renamed_from": "OrcaArena Generic PLA-CF", + "inherits": "Generic PLA-CF @OrcaArena base", "from": "system", "setting_id": "vexlQFuvVzpsYT0Z", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json index 417ef65683..65f69a90ab 100644 --- a/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @OrcaArena 0.2 nozzle", - "inherits": "Generic PVA @OrcaArena base", "renamed_from": "OrcaArena Generic PVA @0.2 nozzle;OrcaArena Generic PVA 0.2 nozzle", + "inherits": "Generic PVA @OrcaArena base", "from": "system", "setting_id": "jX00tEZaqsJvpoBT", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json index bf9cbcda7a..575fa261c0 100644 --- a/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @OrcaArena", - "inherits": "Generic PVA @OrcaArena base", "renamed_from": "OrcaArena Generic PVA", + "inherits": "Generic PVA @OrcaArena base", "from": "system", "setting_id": "S9TMm0n7t54fKHoM", "instantiation": "true", diff --git a/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json index 75fcc13a79..84ae780686 100644 --- a/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json +++ b/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @OrcaArena", - "inherits": "fdm_filament_tpu", "renamed_from": "OrcaArena Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "GBRnBtqYf9H8pQKU", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index f54e45df5a..084a12993f 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -1,6 +1,6 @@ { "name": "OrcaFilamentLibrary", - "version": "02.04.00.13", + "version": "02.04.00.15", "force_update": "0", "description": "Orca Filament Library", "filament_list": [ @@ -472,6 +472,10 @@ "name": "Bambu PETG HF @base", "sub_path": "filament/Bambu/Bambu PETG HF @base.json" }, + { + "name": "Bambu PETG Matte @base", + "sub_path": "filament/Bambu/Bambu PETG Matte @base.json" + }, { "name": "Bambu PETG Translucent @base", "sub_path": "filament/Bambu/Bambu PETG Translucent @base.json" @@ -708,6 +712,10 @@ "name": "Bambu PLA Impact @base", "sub_path": "filament/Bambu/Bambu PLA Impact @base.json" }, + { + "name": "Bambu PLA Lite @base", + "sub_path": "filament/Bambu/Bambu PLA Lite @base.json" + }, { "name": "Bambu PLA Marble @base", "sub_path": "filament/Bambu/Bambu PLA Marble @base.json" @@ -720,6 +728,10 @@ "name": "Bambu PLA Metal @base", "sub_path": "filament/Bambu/Bambu PLA Metal @base.json" }, + { + "name": "Bambu PLA Pure @base", + "sub_path": "filament/Bambu/Bambu PLA Pure @base.json" + }, { "name": "Bambu PLA Silk @base", "sub_path": "filament/Bambu/Bambu PLA Silk @base.json" @@ -736,6 +748,14 @@ "name": "Bambu PLA Tough @base", "sub_path": "filament/Bambu/Bambu PLA Tough @base.json" }, + { + "name": "Bambu PLA Tough+ @base", + "sub_path": "filament/Bambu/Bambu PLA Tough+ @base.json" + }, + { + "name": "Bambu PLA Translucent @base", + "sub_path": "filament/Bambu/Bambu PLA Translucent @base.json" + }, { "name": "Bambu PLA Wood @base", "sub_path": "filament/Bambu/Bambu PLA Wood @base.json" @@ -1192,6 +1212,14 @@ "name": "BETA TPU Matte @base", "sub_path": "filament/BETA/BETA TPU Matte @base.json" }, + { + "name": "Bambu TPU 85A @base", + "sub_path": "filament/Bambu/Bambu TPU 85A @base.json" + }, + { + "name": "Bambu TPU 90A @base", + "sub_path": "filament/Bambu/Bambu TPU 90A @base.json" + }, { "name": "Bambu TPU 95A @base", "sub_path": "filament/Bambu/Bambu TPU 95A @base.json" @@ -1200,6 +1228,10 @@ "name": "Bambu TPU 95A HF @base", "sub_path": "filament/Bambu/Bambu TPU 95A HF @base.json" }, + { + "name": "Bambu TPU for AMS @base", + "sub_path": "filament/Bambu/Bambu TPU for AMS @base.json" + }, { "name": "COEX TPE 30D @base", "sub_path": "filament/COEX/COEX TPE 30D @base.json" @@ -1944,6 +1976,10 @@ "name": "Bambu PETG HF @System", "sub_path": "filament/Bambu/Bambu PETG HF @System.json" }, + { + "name": "Bambu PETG Matte @System", + "sub_path": "filament/Bambu/Bambu PETG Matte @System.json" + }, { "name": "Bambu PETG Translucent @System", "sub_path": "filament/Bambu/Bambu PETG Translucent @System.json" @@ -2652,6 +2688,10 @@ "name": "Bambu PLA Impact @System", "sub_path": "filament/Bambu/Bambu PLA Impact @System.json" }, + { + "name": "Bambu PLA Lite @System", + "sub_path": "filament/Bambu/Bambu PLA Lite @System.json" + }, { "name": "Bambu PLA Marble @System", "sub_path": "filament/Bambu/Bambu PLA Marble @System.json" @@ -2664,6 +2704,10 @@ "name": "Bambu PLA Metal @System", "sub_path": "filament/Bambu/Bambu PLA Metal @System.json" }, + { + "name": "Bambu PLA Pure @System", + "sub_path": "filament/Bambu/Bambu PLA Pure @System.json" + }, { "name": "Bambu PLA Silk @System", "sub_path": "filament/Bambu/Bambu PLA Silk @System.json" @@ -2680,6 +2724,14 @@ "name": "Bambu PLA Tough @System", "sub_path": "filament/Bambu/Bambu PLA Tough @System.json" }, + { + "name": "Bambu PLA Tough+ @System", + "sub_path": "filament/Bambu/Bambu PLA Tough+ @System.json" + }, + { + "name": "Bambu PLA Translucent @System", + "sub_path": "filament/Bambu/Bambu PLA Translucent @System.json" + }, { "name": "Bambu PLA Wood @System", "sub_path": "filament/Bambu/Bambu PLA Wood @System.json" @@ -3892,6 +3944,14 @@ "name": "BETA TPU Matte @BBL X1C", "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL X1C.json" }, + { + "name": "Bambu TPU 85A @System", + "sub_path": "filament/Bambu/Bambu TPU 85A @System.json" + }, + { + "name": "Bambu TPU 90A @System", + "sub_path": "filament/Bambu/Bambu TPU 90A @System.json" + }, { "name": "Bambu TPU 95A @System", "sub_path": "filament/Bambu/Bambu TPU 95A @System.json" @@ -3900,6 +3960,10 @@ "name": "Bambu TPU 95A HF @System", "sub_path": "filament/Bambu/Bambu TPU 95A HF @System.json" }, + { + "name": "Bambu TPU for AMS @System", + "sub_path": "filament/Bambu/Bambu TPU for AMS @System.json" + }, { "name": "COEX TPE 30D @BBL A1", "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL A1.json" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @System.json index 30b5938bd1..9a66aa85db 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @System.json @@ -9,12 +9,27 @@ "60" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_max_volumetric_speed": [ - "16" + "12", + "20", + "25", + "12", + "18", + "18" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "slow_down_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json index 62c2f3bc84..9005778d8f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json @@ -7,9 +7,22 @@ "instantiation": "false", "description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", "filament_cost": [ - "24.99" + "15.99" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @System.json index 2a0c04401e..9c3b25c7f4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @System.json @@ -6,9 +6,19 @@ "setting_id": "mxgv6vFKgwBAF1Gw", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json index 5cdd145c56..368f6415e0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json @@ -13,15 +13,33 @@ "30" ], "filament_cost": [ - "29.99" + "26.99" ], "filament_density": [ "1.08" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_type": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @System.json index d94e4e4d83..0706ff5cc5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @System.json @@ -9,9 +9,19 @@ "25" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json index 432f106879..b848dda3a7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json @@ -16,16 +16,34 @@ "35" ], "filament_cost": [ - "31.99" + "26.99" ], "filament_density": [ "1.05" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_max_volumetric_speed": [ - "12" + "12", + "20", + "25", + "12", + "20", + "20" ], "filament_vendor": [ "Bambu Lab" @@ -37,9 +55,19 @@ "100" ], "nozzle_temperature": [ + "270", + "270", + "270", + "270", + "270", "270" ], "nozzle_temperature_initial_layer": [ + "270", + "270", + "270", + "270", + "270", "270" ], "slow_down_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json index 8343f4f8cb..0b020ea032 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json @@ -16,18 +16,41 @@ "30" ], "filament_cost": [ - "49.99" + "46.99" ], "filament_density": [ "0.99" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.52", + "0.52", + "0.52", + "0.52", + "0.52", "0.52" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_retraction_length": [ + "1.5", + "1.5", + "1.5", + "1.5", + "1.5", "1.5" ], "filament_type": [ @@ -37,15 +60,35 @@ "Bambu Lab" ], "filament_wipe_distance": [ + "5", + "5", + "5", + "5", + "5", "5" ], "filament_z_hop_types": [ + "Normal Lift", + "Normal Lift", + "Normal Lift", + "Normal Lift", + "Normal Lift", "Normal Lift" ], "nozzle_temperature": [ + "270", + "270", + "270", + "270", + "270", "270" ], "nozzle_temperature_initial_layer": [ + "270", + "270", + "270", + "270", + "270", "270" ], "overhang_fan_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json index 66abe8195a..96a8350b01 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json @@ -15,15 +15,33 @@ "25" ], "filament_cost": [ - "36.99" + "33.99" ], "filament_density": [ "1.02" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.9", + "0.9", + "0.9", + "0.9", + "0.9", "0.9" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_type": [ @@ -39,9 +57,19 @@ "100" ], "nozzle_temperature": [ + "275", + "275", + "275", + "275", + "275", "275" ], "nozzle_temperature_initial_layer": [ + "275", + "275", + "275", + "275", + "275", "275" ], "nozzle_temperature_range_low": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @System.json index cadf540846..a37d362c30 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @System.json @@ -6,9 +6,19 @@ "setting_id": "XTve0TGrHzrMdBnZ", "instantiation": "true", "nozzle_temperature_initial_layer": [ + "290", + "290", + "290", + "290", + "290", "290" ], "nozzle_temperature": [ + "290", + "290", + "290", + "290", + "290", "290" ], "fan_max_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json index 00df3d58ef..f42452c512 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json @@ -12,7 +12,20 @@ "filament_density": [ "1.09" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.96", + "0.96", + "0.96", + "0.96", + "0.96", "0.96" ], "filament_type": [ @@ -21,12 +34,6 @@ "filament_vendor": [ "Bambu Lab" ], - "nozzle_temperature": [ - "280" - ], - "nozzle_temperature_initial_layer": [ - "280" - ], "overhang_fan_speed": [ "40" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json index 578e30294c..304890617d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json @@ -16,12 +16,25 @@ "10" ], "filament_cost": [ - "79.99" + "76.99" ], "filament_density": [ "1.10" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.96", + "0.96", + "0.96", + "0.96", + "0.96", "0.96" ], "filament_type": [ @@ -31,9 +44,19 @@ "Bambu Lab" ], "nozzle_temperature": [ + "275", + "275", + "275", + "275", + "275", "275" ], "nozzle_temperature_initial_layer": [ + "275", + "275", + "275", + "275", + "275", "275" ], "overhang_fan_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @System.json index 337bcfae2c..9180402eaa 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @System.json @@ -9,12 +9,27 @@ "60" ], "filament_max_volumetric_speed": [ + "8", + "10.5", + "10.5", + "8", + "10.5", "10.5" ], "nozzle_temperature": [ + "265", + "265", + "265", + "265", + "265", "265" ], "nozzle_temperature_initial_layer": [ + "265", + "265", + "265", + "265", + "265", "265" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json index c9eb830cad..09a6d7ca59 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json @@ -6,6 +6,9 @@ "filament_id": "OFNk8bxk", "instantiation": "false", "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", + "additional_fan_full_speed_layer": [ + "2" + ], "fan_cooling_layer_time": [ "5" ], @@ -16,12 +19,25 @@ "10" ], "filament_cost": [ - "59.99" + "56.99" ], "filament_density": [ "1.14" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.96", + "0.96", + "0.96", + "0.96", + "0.96", "0.96" ], "filament_type": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json index a028b7f7dc..d30f0be200 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json @@ -6,6 +6,9 @@ "filament_id": "OF2VFe4J", "instantiation": "false", "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", + "additional_fan_full_speed_layer": [ + "2" + ], "fan_cooling_layer_time": [ "5" ], @@ -16,12 +19,25 @@ "10" ], "filament_cost": [ - "94.99" + "91.99" ], "filament_density": [ "1.06" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.96", + "0.96", + "0.96", + "0.96", + "0.96", "0.96" ], "filament_type": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @System.json index 2de9e190d2..cf5cc74a10 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @System.json @@ -11,5 +11,13 @@ "slow_down_layer_time": [ "12" ], - "compatible_printers": [] + "compatible_printers": [], + "filament_max_volumetric_speed": [ + "12", + "12", + "30", + "12", + "12", + "20" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json index 5ce775f0d0..56f22a6f3f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json @@ -5,13 +5,29 @@ "from": "system", "filament_id": "OFKhMPeX", "instantiation": "false", + "filament_cost": [ + "36.99" + ], + "filament_density": [ + "1.185" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_vendor": [ "Bambu Lab" ], - "filament_cost": [ - "39.99" - ], "filament_flow_ratio": [ + "0.94", + "0.94", + "0.94", + "0.94", + "0.94", "0.94" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json index 18c02b41a1..7afe6f6ed6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json @@ -6,12 +6,25 @@ "filament_id": "OFg57Nmc", "instantiation": "false", "filament_cost": [ - "0" + "51.99" ], "filament_density": [ "1.19" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.94", + "0.94", + "0.94", + "0.94", + "0.94", "0.94" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json index fe22a52a0a..84673cb64b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json @@ -28,12 +28,25 @@ "10" ], "filament_cost": [ - "84.99" + "81.99" ], "filament_density": [ "1.29" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ + "8", + "8", + "8", + "8", + "8", "8" ], "filament_multitool_ramming_flow": [ @@ -52,9 +65,19 @@ "100" ], "nozzle_temperature": [ + "270", + "270", + "270", + "270", + "270", "270" ], "nozzle_temperature_initial_layer": [ + "270", + "270", + "270", + "270", + "270", "270" ], "nozzle_temperature_range_high": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @System.json index 0eb5c7c460..9a73056129 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @System.json @@ -6,12 +6,27 @@ "setting_id": "CCfgYCmjECjEC2ZS", "instantiation": "true", "filament_max_volumetric_speed": [ - "13" + "10", + "18", + "21", + "10", + "15", + "15" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json index 117416a251..086af82c6a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json @@ -28,16 +28,26 @@ "10" ], "filament_cost": [ - "24.99" + "13.99" ], "filament_density": [ "1.25" ], - "filament_flow_ratio": [ - "0.95" + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" ], - "filament_max_volumetric_speed": [ - "8" + "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", + "0.95" ], "filament_multitool_ramming_flow": [ "8" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @System.json index ac9a5c3db0..453ccc6400 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @System.json @@ -12,10 +12,20 @@ "20" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ - "18" + "18", + "10", + "10", + "18", + "10", + "10" ], "overhang_fan_speed": [ "100" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json index ef4a817974..323b8bcae6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json @@ -27,16 +27,34 @@ "10" ], "filament_cost": [ - "24.99" + "15.99" ], "filament_density": [ "1.28" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ - "0.95" + "0.95", + "0.952", + "0.952", + "0.95", + "0.952", + "0.952" ], "filament_max_volumetric_speed": [ - "12" + "12", + "26", + "30", + "12", + "21", + "21" ], "filament_vendor": [ "Bambu Lab" @@ -48,9 +66,19 @@ "70" ], "nozzle_temperature": [ + "245", + "245", + "245", + "245", + "245", "245" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_range_high": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @System.json new file mode 100644 index 0000000000..04597dba2f --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @System.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "Bambu PETG Matte @System", + "inherits": "Bambu PETG Matte @base", + "from": "system", + "setting_id": "iFrbXE36ZPfvbGeb", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "10", + "15", + "21", + "10", + "15", + "15" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", + "18" + ], + "nozzle_temperature": [ + "250", + "250", + "250", + "250", + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245", + "245", + "245", + "245", + "245" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @base.json new file mode 100644 index 0000000000..7d6b8a692e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Matte @base.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "Bambu PETG Matte @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFdyfQvU", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "13.99" + ], + "filament_density": [ + "1.25" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.95", + "0.97", + "0.97", + "0.95", + "0.97", + "0.97" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @System.json index 990343ec8e..58b7b615fa 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @System.json @@ -6,12 +6,27 @@ "setting_id": "qUW9pYQ6aYUpMb2I", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "filament_retraction_length": [ + "0.3", + "0.3", + "0.3", + "0.3", + "0.3", "0.3" ], "slow_down_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json index 09efd2d8b5..555b2417a5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json @@ -28,15 +28,33 @@ "10" ], "filament_cost": [ - "24.99" + "15.99" ], "filament_density": [ "1.25" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ @@ -52,9 +70,19 @@ "70" ], "nozzle_temperature": [ + "245", + "245", + "245", + "245", + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", + "250", + "250", + "250", + "250", "250" ], "nozzle_temperature_range_high": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @System.json index 2474c3c9da..28ae43ae59 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @System.json @@ -15,12 +15,27 @@ "5" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_max_volumetric_speed": [ + "11.5", + "11.5", + "11.5", + "11.5", + "11.5", "11.5" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "overhang_fan_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json index 89fe7b3dde..ffbae062ae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json @@ -24,16 +24,26 @@ "0" ], "filament_cost": [ - "34.99" + "31.99" ], "filament_density": [ "1.25" ], - "filament_flow_ratio": [ - "0.95" + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" ], - "filament_max_volumetric_speed": [ - "12" + "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", + "0.95" ], "filament_type": [ "PETG-CF" @@ -65,9 +75,6 @@ "slow_down_layer_time": [ "6" ], - "temperature_vitrification": [ - "70" - ], "textured_plate_temp": [ "70" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json index 1fb04ff6a9..5baa67a318 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json @@ -10,15 +10,33 @@ "30" ], "filament_cost": [ - "44.99" + "41.99" ], "filament_density": [ "1.21" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.6", + "0.6", + "0.6", + "0.6", + "0.6", "0.6" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ @@ -30,9 +48,6 @@ "filament_vendor": [ "Bambu Lab" ], - "filament_scarf_seam_type": [ - "none" - ], "nozzle_temperature_range_low": [ "210" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @System.json index 04ae179bcc..3e267d9444 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @System.json @@ -6,12 +6,27 @@ "setting_id": "zkc85XTKi4cb6cOw", "instantiation": "true", "filament_max_volumetric_speed": [ - "21" + "12", + "21", + "40", + "12", + "21", + "30" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json index d5614af65f..96bf0e01d8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json @@ -6,30 +6,31 @@ "filament_id": "OFoiVqVM", "instantiation": "false", "filament_cost": [ - "24.99" + "15.99" ], "filament_density": [ "1.26" ], - "filament_flow_ratio": [ - "0.98" + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" ], - "filament_max_volumetric_speed": [ - "12" + "filament_flow_ratio": [ + "0.98", + "0.985", + "0.985", + "0.98", + "0.985", + "0.985" ], "filament_vendor": [ "Bambu Lab" ], - "filament_scarf_seam_type": [ - "none" - ], - "filament_scarf_height": [ - "10%" - ], "filament_scarf_gap": [ "0%" - ], - "filament_scarf_length": [ - "10" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @System.json index 15adc3e70f..51190b04ab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @System.json @@ -6,9 +6,19 @@ "setting_id": "NZkeYlElza4KiVEo", "instantiation": "true", "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "12", + "21", + "21", + "12", + "21", "21" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json index 7b1290817d..544235249e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json @@ -11,6 +11,14 @@ "filament_density": [ "1.26" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_vendor": [ "Bambu Lab" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @System.json index 69dc00e4e1..7b9c100352 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @System.json @@ -6,9 +6,19 @@ "setting_id": "O21mHwtRSSE6HEfS", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json index 3ecc707ddf..09086beec7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json @@ -6,15 +6,33 @@ "filament_id": "OFQ3e56w", "instantiation": "false", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.19" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @System.json index 62b7248f32..6924441f5d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @System.json @@ -6,9 +6,19 @@ "setting_id": "BiwTTWJCMV2qcaF1", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json index 8395082e6d..50ed9ba8fd 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json @@ -6,21 +6,39 @@ "filament_id": "OFEkPBwx", "instantiation": "false", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.26" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_vendor": [ "Bambu Lab" ], - "temperature_vitrification": [ - "45" + "required_nozzle_HRC": [ + "40" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @System.json index 342d7667f8..7a1c0c90b5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @System.json @@ -6,7 +6,12 @@ "setting_id": "1qdr65SvIErZzxN3", "instantiation": "true", "filament_max_volumetric_speed": [ - "23.2" + "12", + "21", + "21", + "12", + "21", + "21" ], "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json index 1ff6cb84cc..33cfe9bbf6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json @@ -8,7 +8,20 @@ "filament_cost": [ "25.4" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @System.json new file mode 100644 index 0000000000..bd4b09654b --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @System.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Bambu PLA Lite @System", + "inherits": "Bambu PLA Lite @base", + "from": "system", + "setting_id": "MmKkT3hRnIEeSeXm", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", + "18" + ], + "nozzle_temperature": [ + "220", + "220", + "220", + "220", + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220", + "220", + "220", + "220", + "220" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @base.json new file mode 100644 index 0000000000..81ccf320ed --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Lite @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Bambu PLA Lite @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFnfxTvi", + "instantiation": "false", + "filament_cost": [ + "18.99" + ], + "filament_density": [ + "1.40" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "21", + "40", + "12", + "16", + "16" + ], + "filament_vendor": [ + "Bambu Lab" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @System.json index 0573904f7f..67b3b9273c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @System.json @@ -6,9 +6,19 @@ "setting_id": "oNGmbbdba2aULYwQ", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json index 0faa115520..74d40dde58 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json @@ -6,12 +6,25 @@ "filament_id": "OF9OlTWH", "instantiation": "false", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @System.json index bb359354b1..eb3d72adff 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @System.json @@ -6,12 +6,27 @@ "setting_id": "POQTCsM5qwSXswgr", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_max_volumetric_speed": [ - "22" + "11", + "19.5", + "40", + "11", + "19.5", + "25" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json index ac7760f632..fa68a8c519 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json @@ -6,27 +6,34 @@ "filament_id": "OFXIbw5D", "instantiation": "false", "filament_cost": [ - "24.99" + "15.99" ], "filament_density": [ "1.32" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ "Bambu Lab" ], - "filament_scarf_seam_type": [ - "none" - ], "filament_scarf_height": [ "5%" ], "filament_scarf_gap": [ "0%" - ], - "filament_scarf_length": [ - "10" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @System.json index 7a1a9661d8..c3616606cf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @System.json @@ -6,6 +6,11 @@ "setting_id": "7w5T6uXXrwLzQb5D", "instantiation": "true", "filament_max_volumetric_speed": [ + "12", + "21", + "21", + "12", + "21", "21" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json index 81a9c95c24..3a319c357c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json @@ -7,18 +7,28 @@ "instantiation": "false", "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.25" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ "Bambu Lab" - ], - "filament_scarf_seam_type": [ - "none" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @System.json new file mode 100644 index 0000000000..e18d718039 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Bambu PLA Pure @System", + "inherits": "Bambu PLA Pure @base", + "from": "system", + "setting_id": "MI6Z51sJkjOmlIl0", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @base.json new file mode 100644 index 0000000000..cc37c38cfa --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Pure @base.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "Bambu PLA Pure @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFTHDCqA", + "instantiation": "false", + "filament_cost": [ + "16.99" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", + "0.98" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @System.json index 8114f02586..8a3c41a981 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @System.json @@ -5,5 +5,13 @@ "from": "system", "setting_id": "urdS8L3VweWtD0bW", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_max_volumetric_speed": [ + "7.5", + "7.5", + "7.5", + "7.5", + "7.5", + "7.5" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json index f76daf5b77..3010ab3b71 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json @@ -7,12 +7,25 @@ "instantiation": "false", "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.32" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ @@ -25,9 +38,19 @@ "0%" ], "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ], "supertack_plate_temp": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @System.json index c58e4dbc95..97db4b7d66 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @System.json @@ -11,5 +11,13 @@ "supertack_plate_temp_initial_layer": [ "35" ], - "compatible_printers": [] + "compatible_printers": [], + "filament_max_volumetric_speed": [ + "7.5", + "7.5", + "7.5", + "7.5", + "7.5", + "7.5" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json index 93e6e81148..26fb14ac08 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json @@ -7,27 +7,47 @@ "instantiation": "false", "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", "filament_cost": [ - "29.99" + "15.99" ], "filament_density": [ "1.27" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ - "0.98" + "0.98", + "0.985", + "0.985", + "0.98", + "0.985", + "0.985" ], "filament_scarf_height": [ "5%" ], - "filament_scarf_seam_type": [ - "all" - ], "filament_vendor": [ "Bambu Lab" ], "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json index 152b762069..e9ed1a15ca 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json @@ -6,12 +6,25 @@ "filament_id": "OFDxfPgH", "instantiation": "false", "filament_cost": [ - "29.99" + "21.99" ], "filament_density": [ "1.26" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @System.json index 98ac23e383..206a921cea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @System.json @@ -6,6 +6,11 @@ "setting_id": "ZxjDjF5XAaoeOobw", "instantiation": "true", "filament_max_volumetric_speed": [ + "12", + "21", + "21", + "12", + "21", "21" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json index a5aa15e8c1..dfa1936ab9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json @@ -11,7 +11,20 @@ "filament_density": [ "1.26" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @System.json new file mode 100644 index 0000000000..191fc1baad --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @System.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "Bambu PLA Tough+ @System", + "inherits": "Bambu PLA Tough+ @base", + "from": "system", + "setting_id": "5DfKHufhlLWJBqNG", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "12", + "18", + "18", + "12", + "18", + "18" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", + "18" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @base.json new file mode 100644 index 0000000000..efe3f7aea1 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough+ @base.json @@ -0,0 +1,67 @@ +{ + "type": "filament", + "name": "Bambu PLA Tough+ @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OF342jVN", + "instantiation": "false", + "additional_cooling_fan_speed": [ + "80" + ], + "filament_change_length": [ + "5" + ], + "filament_cost": [ + "20.99" + ], + "filament_density": [ + "1.21" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", + "0.98" + ], + "filament_prime_volume": [ + "30" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "nozzle_temperature": [ + "245", + "245", + "245", + "245", + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245", + "245", + "245", + "245", + "245" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @System.json new file mode 100644 index 0000000000..1db5196607 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Bambu PLA Translucent @System", + "inherits": "Bambu PLA Translucent @base", + "from": "system", + "setting_id": "M48unzzxHYxY9hUU", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @base.json new file mode 100644 index 0000000000..0cfa44ea55 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Translucent @base.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "Bambu PLA Translucent @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFFbSnCD", + "instantiation": "false", + "filament_cost": [ + "15.99" + ], + "filament_density": [ + "1.22" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", + "0.98" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json index b9686af187..075d0f175d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json @@ -6,26 +6,51 @@ "filament_id": "OFMjtqTC", "instantiation": "false", "filament_cost": [ - "24.99" + "21.99" ], "filament_density": [ "1.21" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], - "filament_scarf_seam_type": [ - "none" - ], "filament_vendor": [ "Bambu Lab" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @System.json index a677e25a26..e0a7db2a04 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @System.json @@ -6,18 +6,43 @@ "setting_id": "JKf6MqhbAM6NRWNY", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_max_volumetric_speed": [ + "12", + "15", + "15", + "12", + "15", "15" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json index 7bd37d40a4..652b978391 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json @@ -15,12 +15,25 @@ "45" ], "filament_cost": [ - "34.99" + "31.99" ], "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_type": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @System.json index 4200478407..958e721fe9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @System.json @@ -5,5 +5,13 @@ "from": "system", "setting_id": "NEjBweIYKppi6T0Q", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_max_volumetric_speed": [ + "6.5", + "6.5", + "6.5", + "6.5", + "6.5", + "6.5" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json index 8519203173..e25994ff90 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json @@ -5,6 +5,14 @@ "from": "system", "filament_id": "OF54B0S0", "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_vendor": [ "Bambu Lab" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json index b48f3b9300..8f6b42d96d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json @@ -10,7 +10,7 @@ "30" ], "filament_cost": [ - "175" + "169.32" ], "filament_density": [ "1.26" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @System.json index b0f82e6b71..ed4df6036f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @System.json @@ -6,9 +6,19 @@ "setting_id": "Eb9Y2xbVDpjuptrv", "instantiation": "true", "nozzle_temperature": [ + "240", + "240", + "240", + "240", + "240", "240" ], "nozzle_temperature_initial_layer": [ + "240", + "240", + "240", + "240", + "240", "240" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json index 1c6e0f2201..7d8917cf86 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json @@ -7,13 +7,26 @@ "instantiation": "false", "description": "This is a water-soluble support filament, and usually it is only for the support structure and not for the model body. Printing this filament is of many requirements, and to get better printing quality, please refer to this wiki: PVA Printing Guide.", "filament_cost": [ - "79.98" + "73.98" ], "filament_density": [ "1.27" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ - "6" + "4", + "4", + "4", + "4", + "4", + "4" ], "filament_vendor": [ "Bambu Lab" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json index 7adbcb812d..6f15479b24 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json @@ -15,6 +15,14 @@ "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_is_support": [ "1" ], @@ -22,9 +30,19 @@ "Bambu Lab" ], "nozzle_temperature": [ + "280", + "280", + "280", + "280", + "280", "280" ], "nozzle_temperature_initial_layer": [ + "280", + "280", + "280", + "280", + "280", "280" ], "required_nozzle_HRC": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json index 9511f5c0cd..8dc7f82786 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json @@ -13,11 +13,19 @@ "40" ], "filament_cost": [ - "69.98" + "39.98" ], "filament_density": [ "1.30" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_is_support": [ "1" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @System.json index 06af8de863..0e5d882c32 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @System.json @@ -12,9 +12,19 @@ "60" ], "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json index 63802d3794..42b946de62 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json @@ -21,10 +21,23 @@ "filament_density": [ "1.19" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_is_support": [ "1" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ @@ -43,9 +56,19 @@ "60" ], "nozzle_temperature": [ + "210", + "210", + "210", + "210", + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", + "210", + "210", + "210", + "210", "210" ], "slow_down_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json index 35cc03e9b8..148f1a6e1c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json @@ -15,6 +15,14 @@ "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_is_support": [ "1" ], @@ -22,9 +30,19 @@ "Bambu Lab" ], "nozzle_temperature": [ + "280", + "280", + "280", + "280", + "280", "280" ], "nozzle_temperature_initial_layer": [ + "280", + "280", + "280", + "280", + "280", "280" ], "required_nozzle_HRC": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json index a922afd83e..5f8135bfdc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json @@ -18,6 +18,14 @@ "filament_density": [ "1.30" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_is_support": [ "1" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @System.json index 3e998e0cc4..6e53555d93 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @System.json @@ -6,9 +6,19 @@ "setting_id": "5fy5QeiH5NyGq69r", "instantiation": "true", "filament_long_retractions_when_cut": [ + "1", + "1", + "1", + "1", + "1", "1" ], "filament_retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", + "18", "18" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json index b844ac16c7..8f6c3d6996 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json @@ -10,15 +10,33 @@ "30" ], "filament_cost": [ - "29.98" + "23.98" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_is_support": [ "1" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @System.json new file mode 100644 index 0000000000..73ec0a348b --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Bambu TPU 85A @System", + "inherits": "Bambu TPU 85A @base", + "from": "system", + "setting_id": "rmOR0b5LEO1Db9Db", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @base.json new file mode 100644 index 0000000000..e8acb25e51 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 85A @base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "Bambu TPU 85A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFlfuj2k", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "41.99" + ], + "filament_density": [ + "1.18" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "2.2", + "2.2", + "2.2", + "2.2", + "2.2", + "2.2" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "nozzle_temperature": [ + "225", + "225", + "225", + "225", + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225", + "225", + "225", + "225", + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "20" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @System.json new file mode 100644 index 0000000000..55631055a2 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Bambu TPU 90A @System", + "inherits": "Bambu TPU 90A @base", + "from": "system", + "setting_id": "YCcBMzzb9pqPsesL", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @base.json new file mode 100644 index 0000000000..ace53ae601 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 90A @base.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Bambu TPU 90A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFtkLO6q", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "38.99" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "2.8", + "2.8", + "2.8", + "2.8", + "2.8", + "2.8" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "nozzle_temperature": [ + "225", + "225", + "225", + "225", + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225", + "225", + "225", + "225", + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @System.json index 5973e084b3..af343b5c5a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @System.json @@ -6,7 +6,12 @@ "setting_id": "LVi6dblW9n9rnSNJ", "instantiation": "true", "filament_max_volumetric_speed": [ - "3.6" + "3.2", + "3.2", + "3.2", + "3.2", + "3.2", + "3.2" ], "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json index 5b71c52f81..4cf5910c79 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json @@ -12,13 +12,31 @@ "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_vendor": [ "Bambu Lab" ], "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json index 95263eb4ef..d89e277204 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json @@ -7,24 +7,52 @@ "instantiation": "false", "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", "filament_cost": [ - "41.99" + "38.99" ], "filament_density": [ "1.22" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ + "12", + "12", + "12", + "12", + "12", "12" ], "filament_retraction_length": [ + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", "0.8" ], "filament_vendor": [ "Bambu Lab" ], "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", "230" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @System.json new file mode 100644 index 0000000000..2a366e7da5 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Bambu TPU for AMS @System", + "inherits": "Bambu TPU for AMS @base", + "from": "system", + "setting_id": "kYivBf7yRPZlOH2U", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @base.json new file mode 100644 index 0000000000..dd8aada9db --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU for AMS @base.json @@ -0,0 +1,106 @@ +{ + "type": "filament", + "name": "Bambu TPU for AMS @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFIBbYO5", + "instantiation": "false", + "description": "If you are to print a kind of soft TPU, please don't slice with this profile, and it is only for TPU that has high enough hardness (not less than 55D) and is compatible with the AMS. To get better printing quality, please refer to this wiki: TPU printing guide.", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "20" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.26" + ], + "filament_deretraction_speed": [ + "10", + "10", + "10", + "10", + "10", + "10" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_flow_ratio": [ + "0.97", + "0.97", + "0.97", + "0.97", + "0.97", + "0.97" + ], + "filament_max_volumetric_speed": [ + "18", + "18", + "18", + "18", + "18", + "18" + ], + "filament_retraction_length": [ + "2", + "0.4", + "0.4", + "2", + "0.4", + "0.4" + ], + "filament_retraction_speed": [ + "10", + "10", + "10", + "10", + "10", + "10" + ], + "filament_type": [ + "TPU-AMS" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "nozzle_temperature": [ + "230", + "230", + "230", + "230", + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230", + "230", + "230", + "230", + "230" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "overhang_fan_threshold": [ + "25%" + ], + "slow_down_layer_time": [ + "10" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @System.json index 5fac752fcf..7b347e5f79 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC ABS @System", - "inherits": "DREMC ABS @base", - "from": "system", - "setting_id": "gNjISMxTLwQzDrV9", - "instantiation": "true", - "compatible_printers": [] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC ABS @System", + "inherits": "DREMC ABS @base", + "from": "system", + "setting_id": "gNjISMxTLwQzDrV9", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json index fbd2a32e8f..283ba5535c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json @@ -1,35 +1,35 @@ -{ - "type": "filament", - "name": "DREMC ABS @base", - "inherits": "fdm_filament_abs", - "from": "system", - "filament_id": "OFzrUUxc", - "instantiation": "false", - "filament_cost": [ - "24" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_shrink": [ - "99.7" - ], - "fan_max_speed": [ - "20" - ], - "overhang_fan_speed": [ - "50" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "chamber_temperature": [ - "60" - ], - "filament_vendor": [ - "DREMC" - ] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OFzrUUxc", + "instantiation": "false", + "filament_cost": [ + "24" + ], + "filament_density": [ + "1.06" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_shrink": [ + "99.7" + ], + "fan_max_speed": [ + "20" + ], + "overhang_fan_speed": [ + "50" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "chamber_temperature": [ + "60" + ], + "filament_vendor": [ + "DREMC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @System.json index 0d0345828e..6e367b2622 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC ABS+ @System", - "inherits": "DREMC ABS+ @base", - "from": "system", - "setting_id": "M73sIwcpWv6zpFrb", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC ABS+ @System", + "inherits": "DREMC ABS+ @base", + "from": "system", + "setting_id": "M73sIwcpWv6zpFrb", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json index 6817351573..8f9fb0abad 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json @@ -1,26 +1,26 @@ -{ - "type": "filament", - "name": "DREMC ABS+ @base", - "inherits": "fdm_filament_abs", - "from": "system", - "filament_id": "OF99vXPs", - "instantiation": "false", - "filament_cost": [ - "24" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.93" - ], - "filament_shrink": [ - "99.7" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "DREMC" - ] -} +{ + "type": "filament", + "name": "DREMC ABS+ @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OF99vXPs", + "instantiation": "false", + "filament_cost": [ + "24" + ], + "filament_density": [ + "1.06" + ], + "filament_flow_ratio": [ + "0.93" + ], + "filament_shrink": [ + "99.7" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "DREMC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @System.json index f5cde22b77..ab136b1c02 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @System.json @@ -1,15 +1,15 @@ -{ - "type": "filament", - "name": "DREMC ABS-GF @System", - "inherits": "DREMC ABS-GF @base", - "from": "system", - "setting_id": "eWq555EPhD9cVAPL", - "instantiation": "true", - "filament_long_retractions_when_cut": [ - "1" - ], - "filament_retraction_distances_when_cut": [ - "18" - ], - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC ABS-GF @System", + "inherits": "DREMC ABS-GF @base", + "from": "system", + "setting_id": "eWq555EPhD9cVAPL", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json index 046a015930..397ca63348 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json @@ -1,44 +1,44 @@ -{ - "type": "filament", - "name": "DREMC ABS-GF @base", - "inherits": "fdm_filament_abs", - "from": "system", - "filament_id": "OFCidU7j", - "instantiation": "false", - "fan_cooling_layer_time": [ - "12" - ], - "fan_max_speed": [ - "30" - ], - "filament_cost": [ - "40" - ], - "filament_density": [ - "1.12" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_shrink": [ - "99.7" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "filament_type": [ - "ABS-GF" - ], - "filament_vendor": [ - "DREMC" - ], - "overhang_fan_speed": [ - "30" - ], - "overhang_fan_threshold": [ - "10%" - ], - "slow_down_layer_time": [ - "4" - ] -} +{ + "type": "filament", + "name": "DREMC ABS-GF @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OFCidU7j", + "instantiation": "false", + "fan_cooling_layer_time": [ + "12" + ], + "fan_max_speed": [ + "30" + ], + "filament_cost": [ + "40" + ], + "filament_density": [ + "1.12" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_shrink": [ + "99.7" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_type": [ + "ABS-GF" + ], + "filament_vendor": [ + "DREMC" + ], + "overhang_fan_speed": [ + "30" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "4" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @System.json index 10d6626540..d5481e90f6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC ASA @System", - "inherits": "DREMC ASA @base", - "from": "system", - "setting_id": "PMulSQ0tYbNyvOYw", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC ASA @System", + "inherits": "DREMC ASA @base", + "from": "system", + "setting_id": "PMulSQ0tYbNyvOYw", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json index 5e5e96b148..9b12602c7b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json @@ -1,44 +1,44 @@ -{ - "type": "filament", - "name": "DREMC ASA @base", - "inherits": "fdm_filament_asa", - "from": "system", - "filament_id": "OFLNgV3C", - "instantiation": "false", - "eng_plate_temp": [ - "110" - ], - "eng_plate_temp_initial_layer": [ - "110" - ], - "filament_cost": [ - "36" - ], - "filament_density": [ - "1.09" - ], - "filament_flow_ratio": [ - "0.94" - ], - "filament_shrink": [ - "99.7" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "filament_vendor": [ - "DREMC" - ], - "hot_plate_temp": [ - "110" - ], - "hot_plate_temp_initial_layer": [ - "110" - ], - "textured_plate_temp": [ - "110" - ], - "textured_plate_temp_initial_layer": [ - "110" - ] -} +{ + "type": "filament", + "name": "DREMC ASA @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "OFLNgV3C", + "instantiation": "false", + "eng_plate_temp": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "filament_cost": [ + "36" + ], + "filament_density": [ + "1.09" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_shrink": [ + "99.7" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "DREMC" + ], + "hot_plate_temp": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @System.json index 0e10750d78..72d6abf2ca 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC ASA CF @System", - "inherits": "DREMC ASA CF @base", - "from": "system", - "setting_id": "ZcipEKAqtBcAm6vR", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC ASA CF @System", + "inherits": "DREMC ASA CF @base", + "from": "system", + "setting_id": "ZcipEKAqtBcAm6vR", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json index ef6c3bc7b5..01065766e5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json @@ -1,50 +1,50 @@ -{ - "type": "filament", - "name": "DREMC ASA CF @base", - "inherits": "fdm_filament_asa", - "from": "system", - "filament_id": "OFdI4zMo", - "instantiation": "false", - "eng_plate_temp": [ - "110" - ], - "eng_plate_temp_initial_layer": [ - "110" - ], - "filament_cost": [ - "48" - ], - "filament_density": [ - "1.09" - ], - "filament_flow_ratio": [ - "0.92" - ], - "filament_shrink": [ - "99.7" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "filament_vendor": [ - "DREMC" - ], - "hot_plate_temp": [ - "110" - ], - "hot_plate_temp_initial_layer": [ - "110" - ], - "textured_plate_temp": [ - "110" - ], - "textured_plate_temp_initial_layer": [ - "110" - ], - "nozzle_temperature": [ - "265" - ], - "nozzle_temperature_initial_layer": [ - "265" - ] -} +{ + "type": "filament", + "name": "DREMC ASA CF @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "OFdI4zMo", + "instantiation": "false", + "eng_plate_temp": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "filament_cost": [ + "48" + ], + "filament_density": [ + "1.09" + ], + "filament_flow_ratio": [ + "0.92" + ], + "filament_shrink": [ + "99.7" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "DREMC" + ], + "hot_plate_temp": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "265" + ], + "nozzle_temperature_initial_layer": [ + "265" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @System.json index 2d0f99fa1e..18072f734c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC ASA GF @System", - "inherits": "DREMC ASA GF @base", - "from": "system", - "setting_id": "8J3lt7KlQWcx0VUS", - "instantiation": "true", - "compatible_printers": [] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC ASA GF @System", + "inherits": "DREMC ASA GF @base", + "from": "system", + "setting_id": "8J3lt7KlQWcx0VUS", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json index b916335f2f..985063e406 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json @@ -1,50 +1,50 @@ -{ - "type": "filament", - "name": "DREMC ASA GF @base", - "inherits": "fdm_filament_asa", - "from": "system", - "filament_id": "OF2xccEe", - "instantiation": "false", - "eng_plate_temp": [ - "110" - ], - "eng_plate_temp_initial_layer": [ - "110" - ], - "filament_cost": [ - "36" - ], - "filament_density": [ - "1.12" - ], - "filament_flow_ratio": [ - "0.92" - ], - "filament_shrink": [ - "99.7" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "filament_vendor": [ - "DREMC" - ], - "hot_plate_temp": [ - "110" - ], - "hot_plate_temp_initial_layer": [ - "110" - ], - "textured_plate_temp": [ - "110" - ], - "textured_plate_temp_initial_layer": [ - "110" - ], - "nozzle_temperature": [ - "270" - ], - "nozzle_temperature_initial_layer": [ - "270" - ] -} +{ + "type": "filament", + "name": "DREMC ASA GF @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "OF2xccEe", + "instantiation": "false", + "eng_plate_temp": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "filament_cost": [ + "36" + ], + "filament_density": [ + "1.12" + ], + "filament_flow_ratio": [ + "0.92" + ], + "filament_shrink": [ + "99.7" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "DREMC" + ], + "hot_plate_temp": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @System.json index b126651441..46ee06deb1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC PA12-CF @System", - "inherits": "DREMC PA12-CF @base", - "from": "system", - "setting_id": "jVlZ1KPsA5i8RIED", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PA12-CF @System", + "inherits": "DREMC PA12-CF @base", + "from": "system", + "setting_id": "jVlZ1KPsA5i8RIED", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json index 3482ecedf6..db21421565 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json @@ -1,59 +1,59 @@ -{ - "type": "filament", - "name": "DREMC PA12-CF @base", - "inherits": "fdm_filament_pa", - "from": "system", - "filament_id": "OFEhuUNq", - "instantiation": "false", - "fan_cooling_layer_time": [ - "15" - ], - "fan_max_speed": [ - "100" - ], - "filament_cost": [ - "105" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "14" - ], - "filament_type": [ - "PA-CF" - ], - "filament_vendor": [ - "DREMC" - ], - "full_fan_speed_layer": [ - "2" - ], - "nozzle_temperature": [ - "290" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "nozzle_temperature_range_low": [ - "260" - ], - "overhang_fan_speed": [ - "100" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "temperature_vitrification": [ - "131" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ] -} +{ + "type": "filament", + "name": "DREMC PA12-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFEhuUNq", + "instantiation": "false", + "fan_cooling_layer_time": [ + "15" + ], + "fan_max_speed": [ + "100" + ], + "filament_cost": [ + "105" + ], + "filament_density": [ + "1.06" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "14" + ], + "filament_type": [ + "PA-CF" + ], + "filament_vendor": [ + "DREMC" + ], + "full_fan_speed_layer": [ + "2" + ], + "nozzle_temperature": [ + "290" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "nozzle_temperature_range_low": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "131" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @System.json index 61b28cdb4d..26825d9fb4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC PA6-CF @System", - "inherits": "DREMC PA6-CF @base", - "from": "system", - "setting_id": "GPnfqyRGptMQSsGP", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PA6-CF @System", + "inherits": "DREMC PA6-CF @base", + "from": "system", + "setting_id": "GPnfqyRGptMQSsGP", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json index fe5ef518a1..ebf4155d2f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json @@ -1,53 +1,53 @@ -{ - "type": "filament", - "name": "DREMC PA6-CF @base", - "inherits": "fdm_filament_pa", - "from": "system", - "filament_id": "OFsoykbm", - "instantiation": "false", - "fan_cooling_layer_time": [ - "15" - ], - "filament_cost": [ - "68" - ], - "filament_density": [ - "1.25" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_type": [ - "PA6-CF" - ], - "filament_vendor": [ - "DREMC" - ], - "nozzle_temperature": [ - "270" - ], - "nozzle_temperature_initial_layer": [ - "270" - ], - "nozzle_temperature_range_low": [ - "260" - ], - "overhang_fan_speed": [ - "100" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "temperature_vitrification": [ - "215" - ], - "textured_plate_temp": [ - "90" - ], - "textured_plate_temp_initial_layer": [ - "90" - ] -} +{ + "type": "filament", + "name": "DREMC PA6-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFsoykbm", + "instantiation": "false", + "fan_cooling_layer_time": [ + "15" + ], + "filament_cost": [ + "68" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PA6-CF" + ], + "filament_vendor": [ + "DREMC" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature_range_low": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "215" + ], + "textured_plate_temp": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @System.json index 85efd31920..05c758379b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC PET-CF @System", - "inherits": "DREMC PET-CF @base", - "from": "system", - "setting_id": "hal1nPyBF13UL9qB", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PET-CF @System", + "inherits": "DREMC PET-CF @base", + "from": "system", + "setting_id": "hal1nPyBF13UL9qB", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json index 9f7d27a1a0..a9c3db755d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json @@ -1,86 +1,86 @@ -{ - "type": "filament", - "name": "DREMC PET-CF @base", - "inherits": "fdm_filament_pet", - "from": "system", - "filament_id": "OFwJ0qu2", - "instantiation": "false", - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "242" - ], - "fan_min_speed": [ - "0" - ], - "filament_cost": [ - "70" - ], - "filament_density": [ - "1.3" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_type": [ - "PET-CF" - ], - "filament_vendor": [ - "DREMC" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature": [ - "300" - ], - "nozzle_temperature_initial_layer": [ - "300" - ], - "nozzle_temperature_range_high": [ - "300" - ], - "nozzle_temperature_range_low": [ - "270" - ], - "required_nozzle_HRC": [ - "40" - ], - "supertack_plate_temp": [ - "80" - ], - "supertack_plate_temp_initial_layer": [ - "80" - ], - "slow_down_layer_time": [ - "5" - ], - "slow_down_min_speed": [ - "10" - ], - "temperature_vitrification": [ - "147" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ] -} +{ + "type": "filament", + "name": "DREMC PET-CF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFwJ0qu2", + "instantiation": "false", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "242" + ], + "fan_min_speed": [ + "0" + ], + "filament_cost": [ + "70" + ], + "filament_density": [ + "1.3" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PET-CF" + ], + "filament_vendor": [ + "DREMC" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "300" + ], + "nozzle_temperature_initial_layer": [ + "300" + ], + "nozzle_temperature_range_high": [ + "300" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "required_nozzle_HRC": [ + "40" + ], + "supertack_plate_temp": [ + "80" + ], + "supertack_plate_temp_initial_layer": [ + "80" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "10" + ], + "temperature_vitrification": [ + "147" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @System.json index 46f2cb9b20..733448583a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @System.json @@ -1,15 +1,15 @@ -{ - "type": "filament", - "name": "DREMC PETG @System", - "inherits": "DREMC PETG @base", - "from": "system", - "setting_id": "gTGiaBYfymmtlyfG", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "20" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PETG @System", + "inherits": "DREMC PETG @base", + "from": "system", + "setting_id": "gTGiaBYfymmtlyfG", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "20" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json index c67e185527..9bc66b7ef4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json @@ -1,59 +1,59 @@ -{ - "type": "filament", - "name": "DREMC PETG @base", - "inherits": "fdm_filament_pet", - "from": "system", - "filament_id": "OFVBlUFH", - "instantiation": "false", - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "90" - ], - "fan_min_speed": [ - "20" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_vendor": [ - "DREMC" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "overhang_fan_speed": [ - "50" - ], - "overhang_fan_threshold": [ - "10%" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "10" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFVBlUFH", + "instantiation": "false", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "20" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_vendor": [ + "DREMC" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "overhang_fan_speed": [ + "50" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "10" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @System.json index 8e98be30b8..801772818c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @System.json @@ -1,12 +1,12 @@ -{ - "type": "filament", - "name": "DREMC PLA+ HS @System", - "inherits": "DREMC PLA+ HS @base", - "from": "system", - "setting_id": "I0HWhYAZ3ppq91Gx", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "22" - ], - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PLA+ HS @System", + "inherits": "DREMC PLA+ HS @base", + "from": "system", + "setting_id": "I0HWhYAZ3ppq91Gx", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "22" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json index 1d7f1b47af..8aff665468 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json @@ -1,20 +1,20 @@ -{ - "type": "filament", - "name": "DREMC PLA+ HS @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFJHBEGD", - "instantiation": "false", - "filament_cost": [ - "26" - ], - "filament_density": [ - "1.25" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_vendor": [ - "DREMC" - ] -} +{ + "type": "filament", + "name": "DREMC PLA+ HS @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFJHBEGD", + "instantiation": "false", + "filament_cost": [ + "26" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "DREMC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @System.json index 869633969a..37c782593e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @System.json @@ -1,12 +1,12 @@ -{ - "type": "filament", - "name": "DREMC PLA+ @System", - "inherits": "DREMC PLA+ @base", - "from": "system", - "setting_id": "fIjHIsFmdDWIM1bf", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "18" - ], - "compatible_printers": [] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC PLA+ @System", + "inherits": "DREMC PLA+ @base", + "from": "system", + "setting_id": "fIjHIsFmdDWIM1bf", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "18" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json index b989f6d59d..56402a1a71 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json @@ -1,20 +1,20 @@ -{ - "type": "filament", - "name": "DREMC PLA+ @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFSwbBWS", - "instantiation": "false", - "filament_cost": [ - "26" - ], - "filament_density": [ - "1.25" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_vendor": [ - "DREMC" - ] -} +{ + "type": "filament", + "name": "DREMC PLA+ @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFSwbBWS", + "instantiation": "false", + "filament_cost": [ + "26" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "DREMC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @System.json index 32edda19c3..48b62c9ca3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @System.json @@ -1,9 +1,9 @@ -{ - "type": "filament", - "name": "DREMC PPA-CF @System", - "inherits": "DREMC PPA-CF @base", - "from": "system", - "setting_id": "flUD84NuiAfCit8z", - "instantiation": "true", - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC PPA-CF @System", + "inherits": "DREMC PPA-CF @base", + "from": "system", + "setting_id": "flUD84NuiAfCit8z", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json index 6a696177e7..8fd11800be 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json @@ -1,11 +1,11 @@ -{ - "type": "filament", - "name": "DREMC PPA-CF @base", - "inherits": "fdm_filament_ppa", - "from": "system", - "filament_id": "OFiWaoqD", - "instantiation": "false", - "filament_vendor": [ - "DREMC" - ] -} \ No newline at end of file +{ + "type": "filament", + "name": "DREMC PPA-CF @base", + "inherits": "fdm_filament_ppa", + "from": "system", + "filament_id": "OFiWaoqD", + "instantiation": "false", + "filament_vendor": [ + "DREMC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @System.json index 86d5d02151..8278548d38 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @System.json @@ -1,12 +1,12 @@ -{ - "type": "filament", - "name": "DREMC TPU 95A @System", - "inherits": "DREMC TPU 95A @base", - "from": "system", - "setting_id": "AfnFh14wKZsNEaZ1", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "6" - ], - "compatible_printers": [] -} +{ + "type": "filament", + "name": "DREMC TPU 95A @System", + "inherits": "DREMC TPU 95A @base", + "from": "system", + "setting_id": "AfnFh14wKZsNEaZ1", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json index 63d4669b47..a0fe66dc47 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json @@ -1,23 +1,23 @@ -{ - "type": "filament", - "name": "DREMC TPU 95A @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "filament_id": "OFYd5uS3", - "instantiation": "false", - "filament_cost": [ - "40" - ], - "filament_density": [ - "1.25" - ], - "filament_vendor": [ - "DREMC" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ] -} +{ + "type": "filament", + "name": "DREMC TPU 95A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFYd5uS3", + "instantiation": "false", + "filament_cost": [ + "40" + ], + "filament_density": [ + "1.25" + ], + "filament_vendor": [ + "DREMC" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @System.json index 51121cf6fc..0360bbbb63 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo ABS @System", + "renamed_from": "Elegoo ABS", "inherits": "Elegoo ABS @base", "from": "system", "setting_id": "UKRDINWkDngjN16F", "instantiation": "true", - "renamed_from": "Elegoo ABS", "fan_max_speed": [ "40" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @System.json index 6bd0ca95fd..97cc8563df 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo ASA @System", + "renamed_from": "Elegoo ASA", "inherits": "Elegoo ASA @base", "from": "system", "setting_id": "mpSVVs77BAdKmtP6", @@ -17,6 +18,5 @@ "nozzle_temperature_initial_layer": [ "270" ], - "compatible_printers": [], - "renamed_from": "Elegoo ASA" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json index 13ef86c2d9..c469fa9019 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo ASA-CF @System", + "renamed_from": "Elegoo ASA-CF", "inherits": "Elegoo ASA-CF @base", "from": "system", "setting_id": "XT1aUl4pe9t0Ijwg", "instantiation": "true", - "renamed_from": "Elegoo ASA-CF", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json index d07ac1dd64..725896bbd5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PAHT-CF @System", + "renamed_from": "Elegoo PAHT-CF", "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "S073oXCeOlTEqh6L", "instantiation": "true", - "renamed_from": "Elegoo PAHT-CF", "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @System.json index 8d2dcf83b7..6cd55a5668 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PC @System", + "renamed_from": "Elegoo PC", "inherits": "Elegoo PC @base", "from": "system", "setting_id": "NlNHcKHlkiq8khIf", "instantiation": "true", - "renamed_from": "Elegoo PC", "pressure_advance": [ "0.052" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json index 7d2ab85058..e116b9e69a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PC-FR @System", + "renamed_from": "Elegoo PC-FR", "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "JcopkaXZ7YyLjIcw", "instantiation": "true", - "renamed_from": "Elegoo PC-FR", "pressure_advance": [ "0.05" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json index b7191e482b..5609b5ba6b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PET-CF @System", + "renamed_from": "Elegoo PET-CF", "inherits": "Elegoo PET-CF @base", "from": "system", "setting_id": "oloKoC4Bs8dXatMU", "instantiation": "true", - "renamed_from": "Elegoo PET-CF", "pressure_advance": [ "0.05" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @System.json index 621945f027..948f0970b6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PETG @System", + "renamed_from": "Elegoo PETG", "inherits": "Elegoo PETG @base", "from": "system", "setting_id": "4PLHMrDEDw4HLTve", "instantiation": "true", - "renamed_from": "Elegoo PETG", "pressure_advance": [ "0.05" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json index d912550c88..f67f6bbb15 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PETG HF @System", + "renamed_from": "Elegoo PETG HF", "inherits": "Elegoo PETG HF @base", "from": "system", "setting_id": "d6gNuzrG00SXvMth", "instantiation": "true", - "renamed_from": "Elegoo PETG HF", "pressure_advance": [ "0.052" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json index aa30920b7c..988424367e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @System", + "renamed_from": "Elegoo PETG PRO;Elegoo PETG Pro @System", "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "fdfCAYQEoYa9DN6I", @@ -17,6 +18,5 @@ "filament_max_volumetric_speed": [ "5" ], - "compatible_printers": [], - "renamed_from": "Elegoo PETG PRO;Elegoo PETG Pro @System" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json index edb04a6dce..b73dece8de 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PETG Translucent @System", + "renamed_from": "Elegoo PETG Translucent", "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "80Auuv3K7l8IptF3", "instantiation": "true", - "renamed_from": "Elegoo PETG Translucent", "pressure_advance": [ "0.052" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json index 03de8dad0f..9777aec024 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PETG-CF @System", + "renamed_from": "Elegoo PETG-CF", "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "bXRJMaXxB3V49x7R", "instantiation": "true", - "renamed_from": "Elegoo PETG-CF", "pressure_advance": [ "0.052" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json index f315756987..d8fcd5b90a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PETG-GF @System", + "renamed_from": "Elegoo PETG-GF", "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "9NXaejLGh1VFX8bg", "instantiation": "true", - "renamed_from": "Elegoo PETG-GF", "pressure_advance": [ "0.052" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @System.json index 6120c0ac97..6e913207ac 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA @System", + "renamed_from": "Elegoo PLA", "inherits": "Elegoo PLA @base", "from": "system", "setting_id": "jiwZ5eoW1vHoJv9K", @@ -26,6 +27,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json index 15d6f46a3f..ef10b6b1b2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Basic @System", + "renamed_from": "Elegoo PLA Basic", "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "qHDFHECwAInvpuk2", "instantiation": "true", - "renamed_from": "Elegoo PLA Basic", "nozzle_temperature": [ "220" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json index 6fd7f8f606..3b00a8b673 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @System", + "renamed_from": "Elegoo PLA Galaxy", "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "WXEEksjWsTbRyCPh", "instantiation": "true", - "renamed_from": "Elegoo PLA Galaxy", "fan_min_speed": [ "80" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json index 9c4c2075b8..9a0d4d137b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Glow @System", + "renamed_from": "Elegoo PLA Glow", "inherits": "Elegoo PLA Glow @base", "from": "system", "setting_id": "yFdF2YmEMeCHiPxl", "instantiation": "true", - "renamed_from": "Elegoo PLA Glow", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json index 755e42e758..e6309aca95 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Marble @System", + "renamed_from": "Elegoo PLA Marble", "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "kq7NS8IhIV4cBI1C", "instantiation": "true", - "renamed_from": "Elegoo PLA Marble", "fan_min_speed": [ "80" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json index a05c57216e..c97d63d201 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @System", + "renamed_from": "Elegoo PLA Matte", "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "UykE255l5V0oS0Ca", @@ -47,6 +48,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA Matte" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json index fbc18fac42..8ec9dd9746 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @System", + "renamed_from": "Elegoo PLA PRO", "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "62GiUVVZd8kx21vw", @@ -23,6 +24,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA PRO" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json index 79ae01da5b..b6b8387375 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @System", + "renamed_from": "Elegoo PLA Silk", "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "VkXguNj79KADxuYn", @@ -47,6 +48,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA Silk" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json index c7c030ff5a..203f67162e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @System", + "renamed_from": "Elegoo PLA Sparkle", "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "VwZIFCojZLQLPrI1", "instantiation": "true", - "renamed_from": "Elegoo PLA Sparkle", "fan_min_speed": [ "80" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json index 28993f13b4..2fc32af720 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Translucent2 @System", + "renamed_from": "Elegoo PLA Translucent2", "inherits": "Elegoo PLA Translucent2 @base", "from": "system", "setting_id": "q0koYRlO9X8xLXPM", "instantiation": "true", - "renamed_from": "Elegoo PLA Translucent2", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json index 1e86976608..9e54df5c0b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo PLA Wood @System", + "renamed_from": "Elegoo PLA Wood", "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "pMgazYJG8tyTpAVE", "instantiation": "true", - "renamed_from": "Elegoo PLA Wood", "fan_min_speed": [ "80" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json index 2315cd2ac4..c155f82d3d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @System", + "renamed_from": "Elegoo PLA+", "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "q7NpDtaD9dTq1HIZ", @@ -20,6 +21,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA+" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json index 9b79f54799..0bb0edb9b9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @System", + "renamed_from": "Elegoo PLA-CF", "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "cYxM93L2KZBnAuWu", @@ -56,6 +57,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo PLA-CF" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json index 7fd3f8d160..ee13e5c9c9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid PETG @System", + "renamed_from": "Elegoo Rapid PETG;Elegoo Rapid PETG+;Elegoo RAPID PETG;Elegoo RAPID PETG+", "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "uUQSVOvP8tAaDqvB", @@ -32,6 +33,5 @@ "nozzle_temperature_initial_layer": [ "250" ], - "compatible_printers": [], - "renamed_from": "Elegoo Rapid PETG;Elegoo Rapid PETG+;Elegoo RAPID PETG;Elegoo RAPID PETG+" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json index 4f3ee82ced..a632544557 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json @@ -1,6 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid PLA+ @System", + "renamed_from": "Elegoo Rapid PLA+;Elegoo RAPID PLA+", "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "HZ4nP67iAG7a243e", @@ -44,6 +45,5 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], - "compatible_printers": [], - "renamed_from": "Elegoo Rapid PLA+;Elegoo RAPID PLA+" + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json index 3d15ba541c..e64c237aa7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo Rapid TPU 95A @System", + "renamed_from": "Elegoo Rapid TPU 95A", "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "WXLuO112bsdM37MI", "instantiation": "true", - "renamed_from": "Elegoo Rapid TPU 95A", "pressure_advance": [ "0.1" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json index 020bb85945..fdc4a7546d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Elegoo TPU 95A @System", + "renamed_from": "Elegoo TPU 95A", "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "SLcn59fIZPDl2brJ", "instantiation": "true", - "renamed_from": "Elegoo TPU 95A", "filament_max_volumetric_speed": [ "3.2" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json index 09fe0e6298..b73866a0f2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFXCBZTA", - "setting_id": "R1lkPc60BdFq6i2Z", "name": "Eolas Prints ABS @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "R1lkPc60BdFq6i2Z", + "filament_id": "OFXCBZTA", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json index 263752abf1..e5fd6a2412 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFlSNkhc", - "setting_id": "JFXFsEzqXxNqxnsL", "name": "Eolas Prints ASA @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "JFXFsEzqXxNqxnsL", + "filament_id": "OFlSNkhc", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json index 9f1c691c30..33a64f72e5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFhWhL1i", - "setting_id": "u9fzEmHRAACOHT6J", "name": "Eolas Prints PETG @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "u9fzEmHRAACOHT6J", + "filament_id": "OFhWhL1i", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json index 47245f3f54..890d68f491 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFRiFnfQ", - "setting_id": "BY3z4yKW9PQZwgto", "name": "Eolas Prints PETG Transition @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "BY3z4yKW9PQZwgto", + "filament_id": "OFRiFnfQ", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json index 749b37cb54..8c50f37064 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFx8Lmsd", - "setting_id": "eexjO9xiesNROPCK", "name": "Eolas Prints PETG UV Resistant @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "eexjO9xiesNROPCK", + "filament_id": "OFx8Lmsd", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json index a9cbc62ed2..46ebc7ae49 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFkzr35f", - "setting_id": "LAihILsSxo3djWjq", "name": "Eolas Prints PLA Antibacterial @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "LAihILsSxo3djWjq", + "filament_id": "OFkzr35f", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json index 7488530282..2d6555bd1d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFvzvwCu", - "setting_id": "5g69jS4PRY0PbXvI", "name": "Eolas Prints PLA High Speed @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "5g69jS4PRY0PbXvI", + "filament_id": "OFvzvwCu", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json index c4c66400e4..35bf1435e7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFH2nN08", - "setting_id": "jdjLUTsIovrt3UAF", "name": "Eolas Prints PLA INGEO 850 @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "jdjLUTsIovrt3UAF", + "filament_id": "OFH2nN08", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json index f8ae8e662c..8e84babe2f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFPc4zVY", - "setting_id": "AafBj7XbFWaNhKHu", "name": "Eolas Prints PLA INGEO 870 @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "AafBj7XbFWaNhKHu", + "filament_id": "OFPc4zVY", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json index 9489d9f0f7..3b3bef69a4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFf5awy4", - "setting_id": "7LiJHuwirgABvbUa", "name": "Eolas Prints PLA Matte @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "7LiJHuwirgABvbUa", + "filament_id": "OFf5awy4", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json index d6619b629c..034fe0d72f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFrFBEfd", - "setting_id": "sKgUBhF3VvETDkwg", "name": "Eolas Prints PLA Neon @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "sKgUBhF3VvETDkwg", + "filament_id": "OFrFBEfd", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json index 03c332daa0..1ed527c6ad 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFtudokz", - "setting_id": "O2Ur7FIG2YlVEyZp", "name": "Eolas Prints PLA Premium @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "O2Ur7FIG2YlVEyZp", + "filament_id": "OFtudokz", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json index b59d6ebf3d..e913c6a9d9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFbP8zEO", - "setting_id": "WN0GdqBsjhvnyDmG", "name": "Eolas Prints PLA Silk @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "WN0GdqBsjhvnyDmG", + "filament_id": "OFbP8zEO", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json index 22bb2af20a..575d66d2dc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFHfzQXo", - "setting_id": "o3RoG3NGSBlyBkfZ", "name": "Eolas Prints PLA Transition @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "o3RoG3NGSBlyBkfZ", + "filament_id": "OFHfzQXo", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json index c2252c5df8..49643b7cc8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFhfd722", - "setting_id": "bQPvp6BCMzcG8FOi", "name": "Eolas Prints TPU Flex 93A @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "bQPvp6BCMzcG8FOi", + "filament_id": "OFhfd722", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json index f6b85ebd29..3223cc6bb5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFIegjmD", - "setting_id": "XIFP4KMuMtXF5bjQ", "name": "Eolas Prints TPU Flex D53 @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "XIFP4KMuMtXF5bjQ", + "filament_id": "OFIegjmD", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json index 4fc33c0d64..c8bdffbd3a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFvVy7yo", - "setting_id": "rJmsm0zjvsk9Dy0G", "name": "Eolas Prints TPU D60 UV Resistant @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "rJmsm0zjvsk9Dy0G", + "filament_id": "OFvVy7yo", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json index 31dd33a87d..b1f7114d15 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFTOPcx0", - "setting_id": "CM24KGoHLt0yLH93", "name": "Eolas Prints TPU Transition @System", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "CM24KGoHLt0yLH93", + "filament_id": "OFTOPcx0", + "instantiation": "true", "filament_color": [ "#4d9398" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @System.json index bea08bf527..364a065362 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PA @System", + "inherits": "FILL3D PA @base", "from": "system", "setting_id": "IX32M9Hib9UlDHuW", "instantiation": "true", - "inherits": "FILL3D PA @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json index bb8f8905e3..2c243c8779 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PA @base", + "inherits": "fdm_filament_pa", "from": "system", "filament_id": "OFJNeELv", "instantiation": "false", - "inherits": "fdm_filament_pa", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @System.json index 6600d5fc36..0b072d4941 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PETG @System", + "inherits": "FILL3D PETG @base", "from": "system", "setting_id": "f8kKGdxNz45g3xtZ", "instantiation": "true", - "inherits": "FILL3D PETG @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json index f0a0e32f26..a38dadedc4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PETG @base", + "inherits": "fdm_filament_pet", "from": "system", "filament_id": "OFQbjX3s", "instantiation": "false", - "inherits": "fdm_filament_pet", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @System.json index 093e6d0ba8..9d942e6968 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PETG CF @System", + "inherits": "FILL3D PETG CF @base", "from": "system", "setting_id": "MqNSM5lYck0H1Uyd", "instantiation": "true", - "inherits": "FILL3D PETG CF @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json index 0d1dc4a737..1dfedb9045 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PETG CF @base", + "inherits": "fdm_filament_pet", "from": "system", "filament_id": "OFOiJfLM", "instantiation": "false", - "inherits": "fdm_filament_pet", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @System.json index cbe0c934f2..ded0d4cc51 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PLA Basic @System", + "inherits": "FILL3D PLA Basic @base", "from": "system", "setting_id": "b8Gq0WEZwF3Ty1As", "instantiation": "true", - "inherits": "FILL3D PLA Basic @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json index 13d29eaaa8..a053c5278b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PLA Basic @base", + "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFDpW3J8", "instantiation": "false", - "inherits": "fdm_filament_pla", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @System.json index 6fa7fe2738..6e27267a87 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @System.json @@ -1,9 +1,9 @@ { "type": "filament", - "setting_id": "eWB0sfzKjOAnz8iy", "name": "FILL3D PLA Turbo @System", - "from": "system", - "instantiation": "true", "inherits": "FILL3D PLA Turbo @base", + "from": "system", + "setting_id": "eWB0sfzKjOAnz8iy", + "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json index 38be0d7078..f31476056d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PLA Turbo @base", + "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFoSknDB", "instantiation": "false", - "inherits": "fdm_filament_pla", "adaptive_pressure_advance": [ "1" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @System.json index 8a4e89650e..ab9792c196 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PP @System", + "inherits": "FILL3D PP @base", "from": "system", "setting_id": "7FAQwU4JwTfuaGa1", "instantiation": "true", - "inherits": "FILL3D PP @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json index 708e4c50ec..991253f510 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PP @base", + "inherits": "fdm_filament_pp", "from": "system", "filament_id": "OFPWPlSC", "instantiation": "false", - "inherits": "fdm_filament_pp", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @System.json index 313b3ff01b..2dc6362e5f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @System.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FILL3D PPCF @System", + "inherits": "FILL3D PPCF @base", "from": "system", "setting_id": "CuI1vfvq3rjnqXQq", "instantiation": "true", - "inherits": "FILL3D PPCF @base", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json index 6d6aaf9e34..639a6981dd 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FILL3D PPCF @base", + "inherits": "fdm_filament_pp", "from": "system", "filament_id": "OFg8hMzT", "instantiation": "false", - "inherits": "fdm_filament_pp", "filament_vendor": [ "FILL3D" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json index 340dc5da23..d85a652fca 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json @@ -1,53 +1,53 @@ { - "type": "filament", - "name": "FilAr PETG @base", - "inherits": "fdm_filament_pet", - "from": "system", - "filament_id": "OF5rnhjh", - "instantiation": "false", - "filament_type": [ - "PETG" - ], - "filament_vendor": [ - "FilAr" - ], - "filament_diameter": [ - "1.75" - ], - "filament_density": [ - "1.27" - ], - "filament_flow_ratio": [ - "0.95" - ], - "nozzle_temperature": [ - "240" - ], - "nozzle_temperature_initial_layer": [ - "245" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "hot_plate_temp": [ - "78" - ], - "hot_plate_temp_initial_layer": [ - "78" - ], - "textured_plate_temp": [ - "78" - ], - "textured_plate_temp_initial_layer": [ - "78" - ], - "fan_min_speed": [ - "40" - ], - "fan_max_speed": [ - "60" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OF5rnhjh", + "instantiation": "false", + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "FilAr" + ], + "filament_diameter": [ + "1.75" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.95" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp": [ + "78" + ], + "hot_plate_temp_initial_layer": [ + "78" + ], + "textured_plate_temp": [ + "78" + ], + "textured_plate_temp_initial_layer": [ + "78" + ], + "fan_min_speed": [ + "40" + ], + "fan_max_speed": [ + "60" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json index b1284f1d3d..6dba9cad51 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Amarillo Lima", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "QuJY74Af8ssl9uuB", - "filament_id": "OFt6e0US", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#C7E03A" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Amarillo Lima", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "QuJY74Af8ssl9uuB", + "filament_id": "OFt6e0US", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#C7E03A" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json index 00e5af59a1..f40144889a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Amarillo Radiante", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "aFO2PDBIQqvNlH9p", - "filament_id": "OF0Vtzaw", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFD400" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Amarillo Radiante", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "aFO2PDBIQqvNlH9p", + "filament_id": "OF0Vtzaw", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFD400" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json index cbed2c3aa7..bbf4e876b2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Azul Boreal", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "JQsOaH7Zcs0cLLPY", - "filament_id": "OFNU9YIW", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#1B4F9C" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Azul Boreal", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "JQsOaH7Zcs0cLLPY", + "filament_id": "OFNU9YIW", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#1B4F9C" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json index f2d8c16a43..c9919e6833 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Azul Francia", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "O24dTvHOzlbikvmq", - "filament_id": "OF44VYzK", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#0033A0" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Azul Francia", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "O24dTvHOzlbikvmq", + "filament_id": "OF44VYzK", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#0033A0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json index 8c917d750a..e71e68ae3f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Azul Imperial", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "JAUmcvfO2lnmxGj5", - "filament_id": "OF2Z1nT5", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#14306B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Azul Imperial", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "JAUmcvfO2lnmxGj5", + "filament_id": "OF2Z1nT5", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#14306B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json index c2bd7f3368..34e470b384 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Blanco Antartida", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "dd4fL2ztjz4UiTaG", - "filament_id": "OFsXQXbs", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#F7FAFC" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Blanco Antartida", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "dd4fL2ztjz4UiTaG", + "filament_id": "OFsXQXbs", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#F7FAFC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json index ac1d1be6fe..52c4c8765e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Cian", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "kQFbBS3nxU7M2yPa", - "filament_id": "OFnejEt4", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#00B7D4" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Cian", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "kQFbBS3nxU7M2yPa", + "filament_id": "OFnejEt4", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#00B7D4" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json index 9b3e380b57..a3795310ab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Coral", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "fspbgXmAOWjFBQqh", - "filament_id": "OFysxCep", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FF6F5E" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Coral", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "fspbgXmAOWjFBQqh", + "filament_id": "OFysxCep", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FF6F5E" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json index 1e7c947bea..3aa6ef6fe0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Cristal", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "MnA2FnHdIuViwo41", - "filament_id": "OFJQDUk3", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E8F0EC" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Cristal", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "MnA2FnHdIuViwo41", + "filament_id": "OFJQDUk3", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E8F0EC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json index c20eb5fcad..28205f3b09 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Gris Ceniza", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "oYjDczRs4U1JdteC", - "filament_id": "OFybzvQN", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#B4B6B1" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Gris Ceniza", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "oYjDczRs4U1JdteC", + "filament_id": "OFybzvQN", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#B4B6B1" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json index 93335c7951..b013b19150 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Gris Plata", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "eCJ5aFcQ00m97U35", - "filament_id": "OFgpLTMR", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#8C8686" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Gris Plata", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "eCJ5aFcQ00m97U35", + "filament_id": "OFgpLTMR", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#8C8686" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json index 5a8ac777f5..ddca59214d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Magenta", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "CEOhwBE63SWwuh6P", - "filament_id": "OFurdQxc", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#B5174B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Magenta", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "CEOhwBE63SWwuh6P", + "filament_id": "OFurdQxc", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#B5174B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json index 5cba6c4a02..a3325d5214 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Negro Azabache", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "OPZin7y48ZEeiH8D", - "filament_id": "OFq8gfS4", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#000000" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Negro Azabache", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "OPZin7y48ZEeiH8D", + "filament_id": "OFq8gfS4", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#000000" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json index 3ed33ea0f9..aa00dbce0f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PETG Rojo Carmesi", - "inherits": "FilAr PETG @base", - "from": "system", - "setting_id": "ok1h38XzyQXPBIMM", - "filament_id": "OFPbyOSk", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#8C1020" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PETG Rojo Carmesi", + "inherits": "FilAr PETG @base", + "from": "system", + "setting_id": "ok1h38XzyQXPBIMM", + "filament_id": "OFPbyOSk", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#8C1020" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json index c5ed35c1f1..547e5ab043 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json @@ -1,47 +1,47 @@ { - "type": "filament", - "name": "FilAr PLA @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF4KsW72", - "instantiation": "false", - "filament_type": [ - "PLA" - ], - "filament_vendor": [ - "FilAr" - ], - "filament_diameter": [ - "1.75" - ], - "filament_density": [ - "1.24" - ], - "filament_flow_ratio": [ - "0.98" - ], - "nozzle_temperature": [ - "210" - ], - "nozzle_temperature_initial_layer": [ - "215" - ], - "nozzle_temperature_range_low": [ - "200" - ], - "nozzle_temperature_range_high": [ - "220" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OF4KsW72", + "instantiation": "false", + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "FilAr" + ], + "filament_diameter": [ + "1.75" + ], + "filament_density": [ + "1.24" + ], + "filament_flow_ratio": [ + "0.98" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json index 1d6c41003b..e42c565e63 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Amarillo Lirio", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "sZEY2QrlLsDkgZin", - "filament_id": "OF8aFWfQ", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFD52B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Amarillo Lirio", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "sZEY2QrlLsDkgZin", + "filament_id": "OF8aFWfQ", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFD52B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json index a2f84470c4..d369ea77c2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Azul Francia", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "kOF3UfqKVqWKFwiH", - "filament_id": "OFnYVFk2", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#0000FF" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Azul Francia", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "kOF3UfqKVqWKFwiH", + "filament_id": "OFnYVFk2", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#0000FF" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json index e9d68452dc..45f399f37f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Blanco Antartida", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "9KxtnS1WoUAgH323", - "filament_id": "OFHAccHz", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#F7FAFC" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Blanco Antartida", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "9KxtnS1WoUAgH323", + "filament_id": "OFHAccHz", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#F7FAFC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json index 1166928647..ad66e02521 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Blanco Calido", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "pAToQatK3PVTMHrW", - "filament_id": "OFKTSiYF", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFF8E7" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Blanco Calido", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "pAToQatK3PVTMHrW", + "filament_id": "OFKTSiYF", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFF8E7" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json index 599c64038c..51e2a4bb66 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Bronce", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "bJuNDmVGIF0TXvkk", - "filament_id": "OFWTRJ1K", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#AD8428" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Bronce", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "bJuNDmVGIF0TXvkk", + "filament_id": "OFWTRJ1K", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#AD8428" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cafe con Leche.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cafe con Leche.json index b70feb22d4..ffd0d08354 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cafe con Leche.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cafe con Leche.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Cafe con Leche", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "vlPu3T66cQhIr5nl", - "filament_id": "OFWwF7K7", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E0B269" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Cafe con Leche", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "vlPu3T66cQhIr5nl", + "filament_id": "OFWwF7K7", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E0B269" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json index bdb948112a..538c7b23a7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Carpincho", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "dNsCH2BVjuq3jrN7", - "filament_id": "OFKWWgyp", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E8DFC1" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Carpincho", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "dNsCH2BVjuq3jrN7", + "filament_id": "OFKWWgyp", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E8DFC1" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json index f0ca1c323c..a836b2da5b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Celeste Cielo", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "baAQZuzRZD0nwmqH", - "filament_id": "OFaDOaNt", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#A1EBFF" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Celeste Cielo", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "baAQZuzRZD0nwmqH", + "filament_id": "OFaDOaNt", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#A1EBFF" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json index 44402e7b5a..387493e380 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Cobre", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "BpYgVH5d3LOdib3U", - "filament_id": "OFNemJM6", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#87421E" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Cobre", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "BpYgVH5d3LOdib3U", + "filament_id": "OFNemJM6", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#87421E" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json index fd25d70050..a1aefcad52 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Dorado", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "KHIdy0oNw9YYDNOD", - "filament_id": "OF5P4jgA", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#A67F00" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Dorado", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "KHIdy0oNw9YYDNOD", + "filament_id": "OF5P4jgA", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#A67F00" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json index d09d053c53..ae41bd4072 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Gris Ceniza", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "LBpWNtHWPyZi96wr", - "filament_id": "OFIamQnD", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#B4B6B1" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Gris Ceniza", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "LBpWNtHWPyZi96wr", + "filament_id": "OFIamQnD", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#B4B6B1" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json index c6809d1104..ea38dedda9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Gris Pizarra", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "SeePXOShT3cge6TS", - "filament_id": "OFTlRzpe", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#4B4B4B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Gris Pizarra", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "SeePXOShT3cge6TS", + "filament_id": "OFTlRzpe", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#4B4B4B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json index 3748c83352..4091ccc39f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Gris Plata", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "B6HABCdHSblZS7lQ", - "filament_id": "OFKKajh6", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#8C8686" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Gris Plata", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "B6HABCdHSblZS7lQ", + "filament_id": "OFKKajh6", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#8C8686" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json index 81c6eb5928..792fb3a0c8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Manteca", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "tR4io22VQO0J8UsV", - "filament_id": "OFexaZU2", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFF5AB" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Manteca", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "tR4io22VQO0J8UsV", + "filament_id": "OFexaZU2", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFF5AB" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json index 452b48010d..9c8f6f9b3f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Marron Oxido", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "r9eviTeCeTW4rLuz", - "filament_id": "OFAt6ec0", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#5E190E" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Marron Oxido", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "r9eviTeCeTW4rLuz", + "filament_id": "OFAt6ec0", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#5E190E" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json index dd5475f0c6..d42a83f938 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Naranja Tigre", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "zLZxXa78e1oiYWSg", - "filament_id": "OFKZ9skj", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FC5017" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Naranja Tigre", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "zLZxXa78e1oiYWSg", + "filament_id": "OFKZ9skj", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FC5017" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json index aaf06f8833..782e2bc624 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Negro Azabache", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "glc7ip75qjodcceS", - "filament_id": "OFgMWJ8T", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#000000" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Negro Azabache", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "glc7ip75qjodcceS", + "filament_id": "OFgMWJ8T", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#000000" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json index 03e171b525..2102a321b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Oro", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "hCv43F2tNJagwzC7", - "filament_id": "OF5nlfKY", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFD700" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Oro", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "hCv43F2tNJagwzC7", + "filament_id": "OF5nlfKY", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFD700" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json index 4ae2924081..46556f00b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Piel", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "6ZwTYvV27Oj3l33v", - "filament_id": "OFsDXRpS", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FADDAC" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Piel", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "6ZwTYvV27Oj3l33v", + "filament_id": "OFsDXRpS", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FADDAC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rojo de Carreras.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rojo de Carreras.json index 95c3c870bc..358ad6769e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rojo de Carreras.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rojo de Carreras.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Rojo de Carreras", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "5dINxIgy0kMYYNDT", - "filament_id": "OFaEesXQ", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FA0F0F" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Rojo de Carreras", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "5dINxIgy0kMYYNDT", + "filament_id": "OFaEesXQ", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FA0F0F" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json index 62763f36a5..7bc5f981ba 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Rosa Amaranto", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "wgxgJfhOa2ZPikRH", - "filament_id": "OFPqX3x2", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FA4164" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Rosa Amaranto", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "wgxgJfhOa2ZPikRH", + "filament_id": "OFPqX3x2", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FA4164" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json index 9fb203bb0c..2ca378da29 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Rosa Flamenco", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "FhROwdLMSz3cyRZo", - "filament_id": "OFZ4QbfK", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#FFC7C2" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Rosa Flamenco", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "FhROwdLMSz3cyRZo", + "filament_id": "OFZ4QbfK", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#FFC7C2" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json index 6925843d95..3cb6d377b5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Tabaco", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "6ax7ka7LBHqhBigT", - "filament_id": "OFjT9PkZ", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#7D5429" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Tabaco", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "6ax7ka7LBHqhBigT", + "filament_id": "OFjT9PkZ", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#7D5429" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json index f7b823fe5b..b687dd6726 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Titanio", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "ZRedeSWJhUayeJLw", - "filament_id": "OFQWIKbV", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#878681" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Titanio", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "ZRedeSWJhUayeJLw", + "filament_id": "OFQWIKbV", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#878681" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json index e3355ffa43..d4f853d0a7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Verde FilAr", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "SYWoimklLqx5O2Xh", - "filament_id": "OFvPPMxL", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#036D6B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Verde FilAr", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "SYWoimklLqx5O2Xh", + "filament_id": "OFvPPMxL", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#036D6B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json index 46772cf083..0d2c420f7d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Verde Manzana", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "FlPRrQEcKnVKwJDM", - "filament_id": "OFdb8YNz", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#D4FF38" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Verde Manzana", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "FlPRrQEcKnVKwJDM", + "filament_id": "OFdb8YNz", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#D4FF38" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json index 6fe74aa2f3..c1cf89131d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Verde Oliva", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "eWAcT15sDLZeV2uS", - "filament_id": "OFkoLUtR", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#595900" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Verde Oliva", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "eWAcT15sDLZeV2uS", + "filament_id": "OFkoLUtR", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#595900" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json index 9068b293f2..1ae9dbcac8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Verde Pixel", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "Z7toK1R2GuzHVgfo", - "filament_id": "OFkGvN4d", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#02E32F" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Verde Pixel", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "Z7toK1R2GuzHVgfo", + "filament_id": "OFkGvN4d", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#02E32F" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json index fa12bcc077..d79155046b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA Violeta Jacaranda", - "inherits": "FilAr PLA @base", - "from": "system", - "setting_id": "4VO2Qb2cTXQ1TJv2", - "filament_id": "OFP26zNb", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#9342C9" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA Violeta Jacaranda", + "inherits": "FilAr PLA @base", + "from": "system", + "setting_id": "4VO2Qb2cTXQ1TJv2", + "filament_id": "OFP26zNb", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#9342C9" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json index 972f5a4220..669e40909b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json @@ -1,47 +1,47 @@ { - "type": "filament", - "name": "FilAr PLA-mate @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFtOoWIj", - "instantiation": "false", - "filament_type": [ - "PLA" - ], - "filament_vendor": [ - "FilAr" - ], - "filament_diameter": [ - "1.75" - ], - "filament_density": [ - "1.24" - ], - "filament_flow_ratio": [ - "0.98" - ], - "nozzle_temperature": [ - "200" - ], - "nozzle_temperature_initial_layer": [ - "205" - ], - "nozzle_temperature_range_low": [ - "195" - ], - "nozzle_temperature_range_high": [ - "210" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFtOoWIj", + "instantiation": "false", + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "FilAr" + ], + "filament_diameter": [ + "1.75" + ], + "filament_density": [ + "1.24" + ], + "filament_flow_ratio": [ + "0.98" + ], + "nozzle_temperature": [ + "200" + ], + "nozzle_temperature_initial_layer": [ + "205" + ], + "nozzle_temperature_range_low": [ + "195" + ], + "nozzle_temperature_range_high": [ + "210" + ], + "hot_plate_temp": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "textured_plate_temp": [ + "50" + ], + "textured_plate_temp_initial_layer": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json index 98a2349ac1..d9efefd3f7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Amarillo", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "f8DPrkYuTUPJ3cru", - "filament_id": "OFj3bTjw", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E8C547" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Amarillo", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "f8DPrkYuTUPJ3cru", + "filament_id": "OFj3bTjw", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E8C547" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json index 7688708656..2b384f61c5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Azul", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "QMBocqysEed86R9y", - "filament_id": "OF5vgi2G", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#2D5DA8" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Azul", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "QMBocqysEed86R9y", + "filament_id": "OF5vgi2G", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#2D5DA8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json index 2324dadcc5..0a95d908ae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Beige", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "XoilIv3HqpDTVRwv", - "filament_id": "OFGcLA5R", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#D8C4A0" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Beige", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "XoilIv3HqpDTVRwv", + "filament_id": "OFGcLA5R", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#D8C4A0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json index 92f10acf51..26d6aa37d5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Blanco", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "xkotTQheAIUUhPd7", - "filament_id": "OFtefokm", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#F2F2EC" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Blanco", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "xkotTQheAIUUhPd7", + "filament_id": "OFtefokm", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#F2F2EC" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json index 4018c1d710..9ab337468d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Bordo", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "zV2dKrknk0ThDv36", - "filament_id": "OFiDpM1B", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#6E1A2B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Bordo", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "zV2dKrknk0ThDv36", + "filament_id": "OFiDpM1B", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#6E1A2B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Celeste Cielo.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Celeste Cielo.json index ff47203106..38e041c79e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Celeste Cielo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Celeste Cielo.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Celeste Cielo", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "UZW4F0aVz1TqstYi", - "filament_id": "OFqtx549", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#9DC8E8" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Celeste Cielo", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "UZW4F0aVz1TqstYi", + "filament_id": "OFqtx549", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#9DC8E8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json index b67e57db85..071bcf600e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Chocolate", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "DdW1XKqqRuLM1cAd", - "filament_id": "OFdzlrhi", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#4A2E22" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Chocolate", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "DdW1XKqqRuLM1cAd", + "filament_id": "OFdzlrhi", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#4A2E22" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json index 445a44b1e4..d1615e94f2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Gris", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "6OtKg1UxWuNCqsZy", - "filament_id": "OFGVwfK0", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#7E7E7E" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Gris", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "6OtKg1UxWuNCqsZy", + "filament_id": "OFGVwfK0", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#7E7E7E" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json index aa411c3d77..289b15449a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Marron", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "lKOXMY37q8WpMdBA", - "filament_id": "OF8jh0Lk", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#6B4226" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Marron", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "lKOXMY37q8WpMdBA", + "filament_id": "OF8jh0Lk", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#6B4226" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json index 2c382c085d..e817ce8b25 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Naranja", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "MabNpNP8G9RqEruP", - "filament_id": "OFmaeU4a", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E0662A" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Naranja", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "MabNpNP8G9RqEruP", + "filament_id": "OFmaeU4a", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E0662A" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json index 7ec4105a25..2827d288d7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Negro", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "Jwrm1uuCo7UjvgWn", - "filament_id": "OFufTAK9", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#1A1A1A" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Negro", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "Jwrm1uuCo7UjvgWn", + "filament_id": "OFufTAK9", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#1A1A1A" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json index 6635fe8b78..641e338dea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Piel", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "ifbCS3WypTUa1JHr", - "filament_id": "OFfZcoKr", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E8C9A8" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Piel", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "ifbCS3WypTUa1JHr", + "filament_id": "OFfZcoKr", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E8C9A8" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json index bed097ad9a..780517616f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Rojo", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "ak2QX0IS74Nmtyex", - "filament_id": "OFIBXa0k", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#B5302E" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Rojo", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "ak2QX0IS74Nmtyex", + "filament_id": "OFIBXa0k", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#B5302E" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json index 1767674916..1f5848e668 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Rosa", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "GrEXuL6TYue238MK", - "filament_id": "OFausr3F", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#E07A9B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Rosa", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "GrEXuL6TYue238MK", + "filament_id": "OFausr3F", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#E07A9B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json index 0e5bb137e1..bd12219417 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Uva", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "PK1CsK7AS1p1IJaR", - "filament_id": "OFEZ449N", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#5B2A6B" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Uva", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "PK1CsK7AS1p1IJaR", + "filament_id": "OFEZ449N", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#5B2A6B" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json index 67fe0ebfee..6b9d58ddac 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Verde", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "rsLi8jr62hHPgERG", - "filament_id": "OFCjG251", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#3A7D44" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Verde", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "rsLi8jr62hHPgERG", + "filament_id": "OFCjG251", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#3A7D44" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json index e842875905..1b3f32860f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json @@ -1,15 +1,15 @@ { - "type": "filament", - "name": "FilAr PLA-mate Violeta", - "inherits": "FilAr PLA-mate @base", - "from": "system", - "setting_id": "z2Pk06JzY9Tr1WjQ", - "filament_id": "OF2EK9F1", - "instantiation": "true", - "filament_vendor": [ - "FilAr" - ], - "default_filament_colour": [ - "#6B3FA0" - ] -} \ No newline at end of file + "type": "filament", + "name": "FilAr PLA-mate Violeta", + "inherits": "FilAr PLA-mate @base", + "from": "system", + "setting_id": "z2Pk06JzY9Tr1WjQ", + "filament_id": "OF2EK9F1", + "instantiation": "true", + "filament_vendor": [ + "FilAr" + ], + "default_filament_colour": [ + "#6B3FA0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json index e499fa3a73..bdffbd3398 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json @@ -7,5 +7,21 @@ "setting_id": "W0LP8Ah5MHMzogvV", "filament_id": "OFY9muEs", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "25", + "12", + "18", + "18" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json index f55ee5e239..4262791b9d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json @@ -7,5 +7,21 @@ "setting_id": "bcsNcj4DzLb4K5zN", "filament_id": "OFLPAxz3", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "25", + "12", + "20", + "20" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json index 7b34746bb2..20445bfecb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json @@ -6,5 +6,13 @@ "setting_id": "oUpbqz3uzQqND5DG", "filament_id": "OFo2UF2C", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json index 60c330fc39..19d55ea479 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json @@ -6,5 +6,13 @@ "setting_id": "KlHtaJU2GM0uaRGM", "filament_id": "OFjt9en1", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json index 646bef3f28..f0c9e0e16f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json @@ -7,5 +7,13 @@ "filament_id": "OFCD8qiU", "instantiation": "true", "description": "This is neither a commonly used filament, nor one of Bambu filaments, and it varies a lot from brand to brand. So, it's highly recommended to ask its vendor for suitable profile before printing and adjust some parameters according to its performances.", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json index c4acb079be..ff885839f9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json @@ -6,5 +6,21 @@ "setting_id": "A7gedcxip65DXKuf", "filament_id": "OFsFon5l", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "8", + "13", + "13", + "8", + "13", + "13" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json index 4bea15a407..3e9b42ad65 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json @@ -7,5 +7,21 @@ "setting_id": "9DoeedUBMRPSCyu2", "filament_id": "OFg8ndtj", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "8", + "12", + "12", + "8", + "12", + "12" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json index 0e653e5529..fdef334123 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json @@ -7,6 +7,14 @@ "setting_id": "rchW8WI6gcXuAE0V", "filament_id": "OFQLcbps", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_type": [ "PA-CF" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json index f84c7fe7b6..bd4d19e935 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json @@ -7,5 +7,21 @@ "setting_id": "LNjv9LwZnbu7ZASC", "filament_id": "OFLakOUI", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "20", + "30", + "12", + "20", + "20" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json index 41ff08bd5c..717f111802 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json @@ -6,5 +6,21 @@ "setting_id": "21dhMVBuVwR2lzIX", "filament_id": "OFu1evlr", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "18", + "18", + "12", + "15", + "15" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json index 210c48b77a..c8297957b4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json @@ -7,5 +7,13 @@ "filament_id": "OFPklMI1", "instantiation": "true", "description": "This is neither a commonly used filament, nor one of Bambu filaments, and it varies a lot from brand to brand. So, it's highly recommended to ask its vendor for suitable profile before printing and adjust some parameters according to its performances.", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json index 53ca2e0f9d..a67219ac82 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json @@ -5,6 +5,14 @@ "from": "system", "filament_id": "OFd0Fv0k", "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_type": [ "PE-CF" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json index f6fb133324..8b34215571 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json @@ -7,5 +7,21 @@ "setting_id": "YiQZfhL6hH0giSHL", "filament_id": "OFYPdQJh", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "18", + "21", + "10", + "15", + "15" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json index 63472f65a0..e46645a5e1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json @@ -6,7 +6,12 @@ "setting_id": "wNH8CohYIh9y6ayx", "instantiation": "true", "filament_max_volumetric_speed": [ - "20" + "20", + "26", + "30", + "20", + "21", + "21" ], "filament_multitool_ramming_flow": [ "20" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json index 173f397a49..d5557c9176 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json @@ -4,5 +4,13 @@ "inherits": "fdm_filament_pet", "from": "system", "filament_id": "OF7lOgYF", - "instantiation": "false" + "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json index aea01d2740..4127e51392 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json @@ -15,6 +15,11 @@ "5" ], "filament_max_volumetric_speed": [ + "11.5", + "11.5", + "11.5", + "11.5", + "11.5", "11.5" ], "filament_multitool_ramming_flow": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json index 8bf644a26d..13c3ab8234 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json @@ -5,6 +5,14 @@ "from": "system", "filament_id": "OFoYSJKi", "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_type": [ "PETG-CF" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json index c50840c55a..d8d8b19d88 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json @@ -7,5 +7,13 @@ "filament_id": "OF74KeQR", "instantiation": "true", "description": "This is neither a commonly used filament, nor one of Bambu filaments, and it varies a lot from brand to brand. So, it's highly recommended to ask its vendor for suitable profile before printing and adjust some parameters according to its performances.", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json index 7bf0a0e72b..c5274780f3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json @@ -7,5 +7,21 @@ "setting_id": "RcBNzytWgwRrwXXz", "filament_id": "OFDSrzZ8", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "21", + "40", + "12", + "21", + "30" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json index ccd8205595..303ad6ac2f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json @@ -6,11 +6,29 @@ "setting_id": "L9wOwDxavVR7vrL7", "filament_id": "OFmpMwxS", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.98", + "0.98", + "0.98", + "0.98", + "0.98", "0.98" ], "filament_max_volumetric_speed": [ - "18" + "18", + "25", + "40", + "18", + "25", + "30" ], "filament_multitool_ramming_flow": [ "25" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json index 2bb0e98e58..a7dd869115 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json @@ -6,12 +6,22 @@ "setting_id": "RFs9eCKYOMUSmvZf", "instantiation": "true", "filament_max_volumetric_speed": [ - "11" + "11", + "19.5", + "40", + "11", + "19.5", + "25" ], "filament_multitool_ramming_flow": [ "11" ], "filament_retraction_length": [ + "0.8", + "0.8", + "0.8", + "0.8", + "0.8", "0.8" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json index 7fed10e48e..debc41c3ff 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json @@ -4,5 +4,13 @@ "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFmY0l6t", - "instantiation": "false" + "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json index 3bee7ccde6..32fbeccf4c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json @@ -7,10 +7,28 @@ "setting_id": "oPkXDCBrTQB3SRm4", "filament_id": "OFesA6rF", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ + "7.5", + "7.5", + "7.5", + "7.5", + "7.5", "7.5" ], "filament_retraction_length": [ + "0.5", + "0.5", + "0.5", + "0.5", + "0.5", "0.5" ], "compatible_printers": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json index 972ef33800..5d7df3c446 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json @@ -7,11 +7,32 @@ "setting_id": "l2LkEql1SVH0iRqY", "filament_id": "OFWbdGsC", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_flow_ratio": [ + "0.95", + "0.95", + "0.95", + "0.95", + "0.95", "0.95" ], "filament_type": [ "PLA-CF" ], - "compatible_printers": [] + "compatible_printers": [], + "filament_max_volumetric_speed": [ + "12", + "18", + "18", + "12", + "18", + "18" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json index 14e38bc340..869b02e807 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json @@ -7,5 +7,13 @@ "filament_id": "OF1UNk9P", "instantiation": "true", "description": "This is neither a commonly used filament, nor one of Bambu filaments, and it varies a lot from brand to brand. So, it's highly recommended to ask its vendor for suitable profile before printing and adjust some parameters according to its performances.", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json index 3f2ee9f3f0..3e55ce0703 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json @@ -13,6 +13,11 @@ "1.01" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json index 1852185476..92f65b3da2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json @@ -5,6 +5,14 @@ "from": "system", "filament_id": "OFXkm8q1", "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_type": [ "PP-CF" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json index d9bedf9316..101c2be4e7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json @@ -13,6 +13,11 @@ "1.05" ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_multitool_ramming_flow": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json index 958fbc75a6..0c3873595d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json @@ -5,6 +5,14 @@ "from": "system", "filament_id": "OFsijjtH", "instantiation": "false", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_type": [ "PP-GF" ] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json index 99ee7acda7..33c6747a68 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json @@ -9,7 +9,20 @@ "fan_max_speed": [ "35" ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ + "6.5", + "6.5", + "6.5", + "6.5", + "6.5", "6.5" ], "overhang_fan_threshold": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json index 3b5e1b7583..1a93e1db6b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json @@ -6,7 +6,20 @@ "setting_id": "yJCAFLt5wstMgMAY", "filament_id": "OF8Tlg47", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], "filament_max_volumetric_speed": [ + "6", + "6", + "6", + "6", + "6", "6" ], "filament_type": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json index c6300423ba..bd34a8405e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json @@ -7,5 +7,21 @@ "setting_id": "1dlLnJKh1HzQCZVJ", "filament_id": "OFDvXujf", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ], + "filament_max_volumetric_speed": [ + "4", + "4", + "4", + "4", + "4", + "4" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json index cf5aa1a8f6..8d754ab3c7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json @@ -6,5 +6,13 @@ "setting_id": "fjVWcIfxaOAZHNU1", "filament_id": "OFhQfUQY", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json index c8ae9f2562..2a22351156 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json @@ -7,5 +7,13 @@ "setting_id": "D6O8IcmSe8WGqOvb", "filament_id": "OFgbpcy9", "instantiation": "true", - "compatible_printers": [] + "compatible_printers": [], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Extra High Flow", + "Bowden Standard", + "Bowden High Flow", + "Bowden Extra High Flow" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json index b183295021..e421095237 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json @@ -1,275 +1,289 @@ { - "type": "filament", - "name": "INSLOGIC PA6-66 @BBL P2S", - "inherits": "INSLOGIC PA6-66 @base", - "from": "system", - "setting_id": "UHHdgZgE7e8KR2GV", - "instantiation": "true", - "activate_air_filtration": [ - "1" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "close_additional_fan_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "70" - ], - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "70" - ], - "eng_plate_temp": [ - "50" - ], - "eng_plate_temp_initial_layer": [ - "50" - ], - "fan_cooling_layer_time": [ - "20" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "filament_adaptive_volumetric_speed": [ - "0" - ], - "filament_extruder_compatibility": [ - "0" - ], - "filament_cooling_before_tower": [ - "10", - "10" - ], - "filament_preheat_temperature_delta": [ - "0" - ], - "filament_tower_interface_pre_extrusion_dist": [ - "10" - ], - "filament_tower_interface_pre_extrusion_length": [ - "0" - ], - "filament_tower_ironing_area": [ - "4" - ], - "filament_tower_interface_purge_volume": [ - "20" - ], - "filament_tower_interface_print_temp": [ - "-1" - ], - "filament_density": [ - "1.10" - ], - "filament_dev_ams_drying_ams_limitations": [ - "1" - ], - "filament_dev_ams_drying_heat_distortion_temperature": [ - "90" - ], - "filament_dev_ams_drying_temperature": [ - "65", - "80", - "65", - "80" - ], - "filament_dev_ams_drying_time": [ - "12", - "12", - "12", - "12" - ], - "filament_dev_chamber_drying_bed_temperature": [ - "90.0" - ], - "filament_dev_chamber_drying_time": [ - "18" - ], - "filament_dev_drying_cooling_temperature": [ - "65" - ], - "filament_dev_drying_softening_temperature": [ - "85" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_flow_ratio": [ - "0.98", - "0.98" - ], - "filament_flush_temp": [ - "0" - ], - "filament_flush_temp_fast": [ - "0" - ], - "filament_flush_volumetric_speed": [ - "0" - ], - "filament_is_support": [ - "0" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_pre_cooling_temperature": [ - "0" - ], - "filament_pre_cooling_temperature_nc": [ - "0" - ], - "filament_prime_volume": [ - "45" - ], - "filament_prime_volume_nc": [ - "60" - ], - "filament_printable": [ - "3" - ], - "filament_ramming_travel_time_nc": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_ramming_volumetric_speed_nc": [ - "-1" - ], - "filament_scarf_seam_type": [ - "none" - ], - "filament_shrink": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "full_fan_speed_layer": [ - "0" - ], - "additional_fan_full_speed_layer": [ - "0" - ], - "filament_scarf_height": [ - "10%" - ], - "filament_scarf_gap": [ - "0%" - ], - "filament_scarf_length": [ - "10" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_retract_length_nc": [ - "14" - ], - "filament_change_length": [ - "10" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "nozzle_temperature": [ - "255", - "255" - ], - "nozzle_temperature_initial_layer": [ - "255", - "255" - ], - "nozzle_temperature_range_high": [ - "280" - ], - "nozzle_temperature_range_low": [ - "250" - ], - "overhang_fan_speed": [ - "95" - ], - "overhang_fan_threshold": [ - "10%" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "required_nozzle_HRC": [ - "3" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "6" - ], - "slow_down_min_speed": [ - "10" - ], - "supertack_plate_temp": [ - "0" - ], - "supertack_plate_temp_initial_layer": [ - "0" - ], - "temperature_vitrification": [ - "74.2" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0" - ], - "filament_start_gcode": [ - "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" - ], - "filament_end_gcode": [ - "; filament end gcode \n\n" - ], - "filament_adhesiveness_category": [ - "400" - ], - "idle_temperature": [ - "0" - ], - "compatible_printers": [ - "Bambu Lab P2S 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-66 @BBL P2S", + "inherits": "INSLOGIC PA6-66 @base", + "from": "system", + "setting_id": "UHHdgZgE7e8KR2GV", + "instantiation": "true", + "activate_air_filtration": [ + "1", + "1" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70" + ], + "eng_plate_temp": [ + "50" + ], + "eng_plate_temp_initial_layer": [ + "50" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "filament_extruder_compatibility": [ + "0" + ], + "filament_cooling_before_tower": [ + "10", + "10" + ], + "filament_preheat_temperature_delta": [ + "0", + "0" + ], + "filament_tower_interface_pre_extrusion_dist": [ + "10" + ], + "filament_tower_interface_pre_extrusion_length": [ + "0" + ], + "filament_tower_ironing_area": [ + "4" + ], + "filament_tower_interface_purge_volume": [ + "20" + ], + "filament_tower_interface_print_temp": [ + "-1" + ], + "filament_density": [ + "1.10" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "90.0" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_drying_cooling_temperature": [ + "65" + ], + "filament_dev_drying_softening_temperature": [ + "85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_temp_fast": [ + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_is_support": [ + "0" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_pre_cooling_temperature_nc": [ + "0", + "0" + ], + "filament_prime_volume": [ + "45" + ], + "filament_prime_volume_nc": [ + "60" + ], + "filament_printable": [ + "3" + ], + "filament_ramming_travel_time_nc": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_ramming_volumetric_speed_nc": [ + "-1", + "-1" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "full_fan_speed_layer": [ + "0" + ], + "additional_fan_full_speed_layer": [ + "0" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_retract_length_nc": [ + "14", + "14" + ], + "filament_change_length": [ + "10" + ], + "hot_plate_temp": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "nozzle_temperature_range_low": [ + "250" + ], + "overhang_fan_speed": [ + "95" + ], + "overhang_fan_threshold": [ + "10%" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "required_nozzle_HRC": [ + "3" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "6" + ], + "slow_down_min_speed": [ + "10" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "temperature_vitrification": [ + "74.2" + ], + "textured_plate_temp": [ + "50" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "filament_start_gcode": [ + "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_adhesiveness_category": [ + "400" + ], + "idle_temperature": [ + "0" + ], + "compatible_printers": [ + "Bambu Lab P2S 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json index fa71bcc4b7..6a01ae3255 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json @@ -1,210 +1,211 @@ { - "type": "filament", - "name": "INSLOGIC PA6-66 @P1-X1", - "inherits": "INSLOGIC PA6-66 @base", - "from": "system", - "setting_id": "X6EcSgHdfuxoY1lL", - "instantiation": "true", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "40" - ], - "hot_plate_temp": [ - "50" - ], - "textured_plate_temp": [ - "50" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "40" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ], - "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.98", - "0.98" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_cooling_layer_time": [ - "15" - ], - "filament_density": [ - "1.2" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_length": [ - "1", - "1" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_soluble": [ - "0" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "nozzle_temperature_initial_layer": [ - "255", - "255" - ], - "full_fan_speed_layer": [ - "2" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ], - "filament_start_gcode": [ - "; Filament gcode\n" - ], - "nozzle_temperature": [ - "255", - "255" - ], - "temperature_vitrification": [ - "70.4" - ], - "nozzle_temperature_range_low": [ - "250", - "250" - ], - "nozzle_temperature_range_high": [ - "280", - "280" - ], - "filament_flush_temp": [ - "0", - "0" - ], - "filament_flush_volumetric_speed": [ - "0", - "0" - ], - "filament_long_retractions_when_cut": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1", - "-1" - ], - "filament_retraction_distances_when_cut": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_pre_cooling_temperature": [ - "0", - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0", - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0", - "0 0 0 0 0 0" - ], - "idle_temperature": [ - "0" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "compatible_printers": [ - "Bambu Lab X1 0.4 nozzle", - "Bambu Lab X1 Carbon 0.4 nozzle", - "Bambu Lab P1S 0.4 nozzle", - "Bambu Lab X1E 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-66 @P1-X1", + "inherits": "INSLOGIC PA6-66 @base", + "from": "system", + "setting_id": "X6EcSgHdfuxoY1lL", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "eng_plate_temp": [ + "40" + ], + "hot_plate_temp": [ + "50" + ], + "textured_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "40" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "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.98", + "0.98" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_cooling_layer_time": [ + "15" + ], + "filament_density": [ + "1.2" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_soluble": [ + "0" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "full_fan_speed_layer": [ + "2" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "temperature_vitrification": [ + "70.4" + ], + "nozzle_temperature_range_low": [ + "250", + "250" + ], + "nozzle_temperature_range_high": [ + "280", + "280" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "idle_temperature": [ + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json index 91c7c2bdbd..2e2b7b82b5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json @@ -1,275 +1,289 @@ { - "type": "filament", - "name": "INSLOGIC PA6-CF @BBL P2S", - "inherits": "INSLOGIC PA6-CF @base", - "from": "system", - "setting_id": "Km9iCy4A8kukE0AA", - "instantiation": "true", - "activate_air_filtration": [ - "1" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "close_additional_fan_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "70" - ], - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "70" - ], - "eng_plate_temp": [ - "65" - ], - "eng_plate_temp_initial_layer": [ - "65" - ], - "fan_cooling_layer_time": [ - "20" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "filament_adaptive_volumetric_speed": [ - "0" - ], - "filament_extruder_compatibility": [ - "0" - ], - "filament_cooling_before_tower": [ - "10", - "10" - ], - "filament_preheat_temperature_delta": [ - "0" - ], - "filament_tower_interface_pre_extrusion_dist": [ - "10" - ], - "filament_tower_interface_pre_extrusion_length": [ - "0" - ], - "filament_tower_ironing_area": [ - "4" - ], - "filament_tower_interface_purge_volume": [ - "20" - ], - "filament_tower_interface_print_temp": [ - "-1" - ], - "filament_density": [ - "1.12" - ], - "filament_dev_ams_drying_ams_limitations": [ - "1" - ], - "filament_dev_ams_drying_heat_distortion_temperature": [ - "90" - ], - "filament_dev_ams_drying_temperature": [ - "65", - "80", - "65", - "80" - ], - "filament_dev_ams_drying_time": [ - "12", - "12", - "12", - "12" - ], - "filament_dev_chamber_drying_bed_temperature": [ - "90.0" - ], - "filament_dev_chamber_drying_time": [ - "18" - ], - "filament_dev_drying_cooling_temperature": [ - "65" - ], - "filament_dev_drying_softening_temperature": [ - "85" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_flow_ratio": [ - "0.98", - "0.98" - ], - "filament_flush_temp": [ - "0" - ], - "filament_flush_temp_fast": [ - "0" - ], - "filament_flush_volumetric_speed": [ - "0" - ], - "filament_is_support": [ - "0" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_pre_cooling_temperature": [ - "0" - ], - "filament_pre_cooling_temperature_nc": [ - "0" - ], - "filament_prime_volume": [ - "45" - ], - "filament_prime_volume_nc": [ - "60" - ], - "filament_printable": [ - "3" - ], - "filament_ramming_travel_time_nc": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_ramming_volumetric_speed_nc": [ - "-1" - ], - "filament_scarf_seam_type": [ - "none" - ], - "filament_shrink": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "full_fan_speed_layer": [ - "0" - ], - "additional_fan_full_speed_layer": [ - "0" - ], - "filament_scarf_height": [ - "10%" - ], - "filament_scarf_gap": [ - "0%" - ], - "filament_scarf_length": [ - "10" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_retract_length_nc": [ - "14" - ], - "filament_change_length": [ - "10" - ], - "hot_plate_temp": [ - "65" - ], - "hot_plate_temp_initial_layer": [ - "65" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "nozzle_temperature": [ - "275", - "275" - ], - "nozzle_temperature_initial_layer": [ - "280", - "280" - ], - "nozzle_temperature_range_high": [ - "290" - ], - "nozzle_temperature_range_low": [ - "270" - ], - "overhang_fan_speed": [ - "95" - ], - "overhang_fan_threshold": [ - "10%" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "required_nozzle_HRC": [ - "3" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "6" - ], - "slow_down_min_speed": [ - "10" - ], - "supertack_plate_temp": [ - "0" - ], - "supertack_plate_temp_initial_layer": [ - "0" - ], - "temperature_vitrification": [ - "74.2" - ], - "textured_plate_temp": [ - "65" - ], - "textured_plate_temp_initial_layer": [ - "65" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0" - ], - "filament_start_gcode": [ - "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" - ], - "filament_end_gcode": [ - "; filament end gcode \n\n" - ], - "filament_adhesiveness_category": [ - "400" - ], - "idle_temperature": [ - "0" - ], - "compatible_printers": [ - "Bambu Lab P2S 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-CF @BBL P2S", + "inherits": "INSLOGIC PA6-CF @base", + "from": "system", + "setting_id": "Km9iCy4A8kukE0AA", + "instantiation": "true", + "activate_air_filtration": [ + "1", + "1" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70" + ], + "eng_plate_temp": [ + "65" + ], + "eng_plate_temp_initial_layer": [ + "65" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "filament_extruder_compatibility": [ + "0" + ], + "filament_cooling_before_tower": [ + "10", + "10" + ], + "filament_preheat_temperature_delta": [ + "0", + "0" + ], + "filament_tower_interface_pre_extrusion_dist": [ + "10" + ], + "filament_tower_interface_pre_extrusion_length": [ + "0" + ], + "filament_tower_ironing_area": [ + "4" + ], + "filament_tower_interface_purge_volume": [ + "20" + ], + "filament_tower_interface_print_temp": [ + "-1" + ], + "filament_density": [ + "1.12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "90.0" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_drying_cooling_temperature": [ + "65" + ], + "filament_dev_drying_softening_temperature": [ + "85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_temp_fast": [ + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_is_support": [ + "0" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_pre_cooling_temperature_nc": [ + "0", + "0" + ], + "filament_prime_volume": [ + "45" + ], + "filament_prime_volume_nc": [ + "60" + ], + "filament_printable": [ + "3" + ], + "filament_ramming_travel_time_nc": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_ramming_volumetric_speed_nc": [ + "-1", + "-1" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "full_fan_speed_layer": [ + "0" + ], + "additional_fan_full_speed_layer": [ + "0" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_retract_length_nc": [ + "14", + "14" + ], + "filament_change_length": [ + "10" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "275", + "275" + ], + "nozzle_temperature_initial_layer": [ + "280", + "280" + ], + "nozzle_temperature_range_high": [ + "290" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "overhang_fan_speed": [ + "95" + ], + "overhang_fan_threshold": [ + "10%" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "required_nozzle_HRC": [ + "3" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "6" + ], + "slow_down_min_speed": [ + "10" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "temperature_vitrification": [ + "74.2" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "filament_start_gcode": [ + "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_adhesiveness_category": [ + "400" + ], + "idle_temperature": [ + "0" + ], + "compatible_printers": [ + "Bambu Lab P2S 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json index c95e5d3f97..b50fbd38e9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json @@ -1,210 +1,211 @@ { - "type": "filament", - "name": "INSLOGIC PA6-CF @P1-X1", - "inherits": "INSLOGIC PA6-CF @base", - "from": "system", - "setting_id": "ky3k6Q9Fyi3QwCHL", - "instantiation": "true", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "40" - ], - "hot_plate_temp": [ - "65" - ], - "textured_plate_temp": [ - "65" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "40" - ], - "hot_plate_temp_initial_layer": [ - "65" - ], - "textured_plate_temp_initial_layer": [ - "65" - ], - "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.98", - "0.98" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_cooling_layer_time": [ - "15" - ], - "filament_density": [ - "1.2" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_length": [ - "1", - "1" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_soluble": [ - "0" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "nozzle_temperature_initial_layer": [ - "280", - "280" - ], - "full_fan_speed_layer": [ - "2" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ], - "filament_start_gcode": [ - "; Filament gcode\n" - ], - "nozzle_temperature": [ - "275", - "275" - ], - "temperature_vitrification": [ - "70.4" - ], - "nozzle_temperature_range_low": [ - "270", - "270" - ], - "nozzle_temperature_range_high": [ - "290", - "290" - ], - "filament_flush_temp": [ - "0", - "0" - ], - "filament_flush_volumetric_speed": [ - "0", - "0" - ], - "filament_long_retractions_when_cut": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1", - "-1" - ], - "filament_retraction_distances_when_cut": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_pre_cooling_temperature": [ - "0", - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0", - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0", - "0 0 0 0 0 0" - ], - "idle_temperature": [ - "0" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "compatible_printers": [ - "Bambu Lab X1 0.4 nozzle", - "Bambu Lab X1 Carbon 0.4 nozzle", - "Bambu Lab P1S 0.4 nozzle", - "Bambu Lab X1E 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-CF @P1-X1", + "inherits": "INSLOGIC PA6-CF @base", + "from": "system", + "setting_id": "ky3k6Q9Fyi3QwCHL", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "eng_plate_temp": [ + "40" + ], + "hot_plate_temp": [ + "65" + ], + "textured_plate_temp": [ + "65" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "40" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "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.98", + "0.98" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_cooling_layer_time": [ + "15" + ], + "filament_density": [ + "1.2" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_soluble": [ + "0" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "nozzle_temperature_initial_layer": [ + "280", + "280" + ], + "full_fan_speed_layer": [ + "2" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "275", + "275" + ], + "temperature_vitrification": [ + "70.4" + ], + "nozzle_temperature_range_low": [ + "270", + "270" + ], + "nozzle_temperature_range_high": [ + "290", + "290" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "idle_temperature": [ + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json index f654aa67f8..7522dfad87 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json @@ -1,328 +1,343 @@ { - "type": "filament", - "name": "INSLOGIC PETG Pro @BBL P2S", - "inherits": "INSLOGIC PETG Pro @base", - "from": "system", - "setting_id": "6iAMtvQjja2ZKenA", - "instantiation": "true", - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "25" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "filament_flow_ratio": [ - "0.98", - "0.98" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "nozzle_temperature_range_high": [ - "260" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "95%" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_min_speed": [ - "20", - "20" - ], - "textured_plate_temp": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_flush_temp": [ - "0" - ], - "filament_flush_volumetric_speed": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_ramming_volumetric_speed_nc": [ - "-1" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil", - "nil" - ], - "filament_retraction_length": [ - "nil", - "nil" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "first_x_layer_fan_speed": [ - "0" - ], - "filament_pre_cooling_temperature": [ - "0" - ], - "filament_pre_cooling_temperature_nc": [ - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_ramming_travel_time_nc": [ - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "nozzle_temperature": [ - "245", - "245" - ], - "nozzle_temperature_initial_layer": [ - "245", - "245" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0" - ], - "activate_air_filtration": [ - "0" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "close_additional_fan_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "70" - ], - "during_print_exhaust_fan_speed": [ - "70" - ], - "filament_extruder_compatibility": [ - "0" - ], - "filament_cooling_before_tower": [ - "10", - "10" - ], - "filament_preheat_temperature_delta": [ - "0" - ], - "filament_tower_interface_pre_extrusion_dist": [ - "10" - ], - "filament_tower_interface_pre_extrusion_length": [ - "0" - ], - "filament_tower_ironing_area": [ - "4" - ], - "filament_tower_interface_purge_volume": [ - "20" - ], - "filament_tower_interface_print_temp": [ - "-1" - ], - "filament_density": [ - "1.28" - ], - "filament_dev_ams_drying_ams_limitations": [ - "1", - "0" - ], - "filament_dev_ams_drying_heat_distortion_temperature": [ - "75" - ], - "filament_dev_ams_drying_temperature": [ - "65", - "65", - "55", - "55" - ], - "filament_dev_ams_drying_time": [ - "12", - "12", - "12", - "12" - ], - "filament_dev_chamber_drying_bed_temperature": [ - "80" - ], - "filament_dev_chamber_drying_time": [ - "12.0" - ], - "filament_dev_drying_cooling_temperature": [ - "55" - ], - "filament_dev_drying_softening_temperature": [ - "60" - ], - "filament_is_support": [ - "0" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_prime_volume": [ - "45" - ], - "filament_prime_volume_nc": [ - "60" - ], - "filament_printable": [ - "3" - ], - "filament_scarf_seam_type": [ - "none" - ], - "filament_shrink": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "full_fan_speed_layer": [ - "0" - ], - "additional_fan_full_speed_layer": [ - "0" - ], - "filament_scarf_height": [ - "10%" - ], - "filament_scarf_gap": [ - "0%" - ], - "filament_scarf_length": [ - "10" - ], - "filament_retract_length_nc": [ - "14" - ], - "filament_change_length": [ - "10" - ], - "nozzle_temperature_range_low": [ - "240" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "supertack_plate_temp": [ - "70" - ], - "supertack_plate_temp_initial_layer": [ - "70" - ], - "temperature_vitrification": [ - "81" - ], - "filament_start_gcode": [ - "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" - ], - "filament_end_gcode": [ - "; filament end gcode \n\n" - ], - "filament_adhesiveness_category": [ - "300" - ], - "idle_temperature": [ - "0" - ], - "compatible_printers": [ - "Bambu Lab P2S 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PETG Pro @BBL P2S", + "inherits": "INSLOGIC PETG Pro @base", + "from": "system", + "setting_id": "6iAMtvQjja2ZKenA", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "25" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "95%" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20", + "20" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_ramming_volumetric_speed_nc": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_pre_cooling_temperature_nc": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_ramming_travel_time_nc": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "activate_air_filtration": [ + "0", + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "complete_print_exhaust_fan_speed": [ + "70", + "70" + ], + "during_print_exhaust_fan_speed": [ + "70", + "70" + ], + "filament_extruder_compatibility": [ + "0" + ], + "filament_cooling_before_tower": [ + "10", + "10" + ], + "filament_preheat_temperature_delta": [ + "0", + "0" + ], + "filament_tower_interface_pre_extrusion_dist": [ + "10" + ], + "filament_tower_interface_pre_extrusion_length": [ + "0" + ], + "filament_tower_ironing_area": [ + "4" + ], + "filament_tower_interface_purge_volume": [ + "20" + ], + "filament_tower_interface_print_temp": [ + "-1" + ], + "filament_density": [ + "1.28" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_chamber_drying_time": [ + "12.0" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" + ], + "filament_is_support": [ + "0" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_prime_volume": [ + "45" + ], + "filament_prime_volume_nc": [ + "60" + ], + "filament_printable": [ + "3" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "full_fan_speed_layer": [ + "0" + ], + "additional_fan_full_speed_layer": [ + "0" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_retract_length_nc": [ + "14", + "14" + ], + "filament_change_length": [ + "10" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "temperature_vitrification": [ + "81" + ], + "filament_start_gcode": [ + "; Filament gcode\nM145 P0 ; set airduct mode to cooling mode for cooling\nM106 P2 S255 ; turn on auxiliary fan for cooling\nM106 P3 S127 ; turn on chamber fan for cooling\nM1002 gcode_claim_action : 29\nM191 S0 ; wait for chamber temp\nM106 P2 S102 ; turn on chamber cooling fan\nM106 P10 S0 ; turn off left aux fan\nM142 P6 R30 S40 U0.3 V0.8 ; set PETG exhaust chamber autocooling\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_adhesiveness_category": [ + "300" + ], + "idle_temperature": [ + "0" + ], + "compatible_printers": [ + "Bambu Lab P2S 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json index 01411d237f..9269f53bc5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json @@ -1,210 +1,211 @@ { - "type": "filament", - "name": "INSLOGIC PETG Pro @P1-X1", - "inherits": "INSLOGIC PETG Pro @base", - "from": "system", - "setting_id": "miOBX0bGzziXI6SE", - "instantiation": "true", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "40" - ], - "hot_plate_temp": [ - "70" - ], - "textured_plate_temp": [ - "70" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "40" - ], - "hot_plate_temp_initial_layer": [ - "70" - ], - "textured_plate_temp_initial_layer": [ - "70" - ], - "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.98", - "0.98" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_cooling_layer_time": [ - "15" - ], - "filament_density": [ - "1.2" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_length": [ - "1", - "1" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_soluble": [ - "0" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "nozzle_temperature_initial_layer": [ - "245", - "245" - ], - "full_fan_speed_layer": [ - "2" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ], - "filament_start_gcode": [ - "; Filament gcode\n" - ], - "nozzle_temperature": [ - "245", - "245" - ], - "temperature_vitrification": [ - "70.4" - ], - "nozzle_temperature_range_low": [ - "240", - "240" - ], - "nozzle_temperature_range_high": [ - "260", - "260" - ], - "filament_flush_temp": [ - "0", - "0" - ], - "filament_flush_volumetric_speed": [ - "0", - "0" - ], - "filament_long_retractions_when_cut": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1", - "-1" - ], - "filament_retraction_distances_when_cut": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_pre_cooling_temperature": [ - "0", - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0", - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0", - "0 0 0 0 0 0" - ], - "idle_temperature": [ - "0" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "compatible_printers": [ - "Bambu Lab X1 0.4 nozzle", - "Bambu Lab X1 Carbon 0.4 nozzle", - "Bambu Lab P1S 0.4 nozzle", - "Bambu Lab X1E 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PETG Pro @P1-X1", + "inherits": "INSLOGIC PETG Pro @base", + "from": "system", + "setting_id": "miOBX0bGzziXI6SE", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "eng_plate_temp": [ + "40" + ], + "hot_plate_temp": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "40" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "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.98", + "0.98" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_cooling_layer_time": [ + "15" + ], + "filament_density": [ + "1.2" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_soluble": [ + "0" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "full_fan_speed_layer": [ + "2" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "temperature_vitrification": [ + "70.4" + ], + "nozzle_temperature_range_low": [ + "240", + "240" + ], + "nozzle_temperature_range_high": [ + "260", + "260" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "idle_temperature": [ + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json index 88c69393b9..b9a4e0b377 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json @@ -1,190 +1,190 @@ { - "type": "filament", - "name": "INSLOGIC PLA Pro @BBL P2S", - "inherits": "INSLOGIC PLA Pro @base", - "from": "system", - "setting_id": "UAd1QXW7vm9gwoEc", - "instantiation": "true", - "filament_flow_ratio": [ - "0.98", - "0.98" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_scarf_seam_type": [ - "all" - ], - "filament_scarf_height": [ - "10%" - ], - "filament_scarf_gap": [ - "0%" - ], - "filament_scarf_length": [ - "10" - ], - "filament_change_length": [ - "5" - ], - "filament_prime_volume": [ - "30" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" - ], - "eng_plate_temp": [ - "55" - ], - "eng_plate_temp_initial_layer": [ - "55" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_flush_temp": [ - "0", - "0" - ], - "filament_flush_volumetric_speed": [ - "0", - "0" - ], - "filament_long_retractions_when_cut": [ - "nil", - "nil" - ], - "filament_ramming_volumetric_speed": [ - "-1", - "-1" - ], - "filament_ramming_volumetric_speed_nc": [ - "-1", - "-1" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_distances_when_cut": [ - "10", - "10" - ], - "filament_retraction_length": [ - "1", - "1" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "first_x_layer_fan_speed": [ - "40" - ], - "filament_pre_cooling_temperature": [ - "0", - "0" - ], - "filament_pre_cooling_temperature_nc": [ - "0", - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_ramming_travel_time_nc": [ - "0", - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0", - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "nozzle_temperature": [ - "215", - "215" - ], - "nozzle_temperature_initial_layer": [ - "215", - "215" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0", - "0 0 0 0 0 0" - ], - "nozzle_temperature_range_low": [ - "205", - "205" - ], - "nozzle_temperature_range_high": [ - "245", - "245" - ], - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "55" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "55" - ], - "fan_min_speed": [ - "60" - ], - "fan_max_speed": [ - "100" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "compatible_printers": [ - "Bambu Lab P2S 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PLA Pro @BBL P2S", + "inherits": "INSLOGIC PLA Pro @base", + "from": "system", + "setting_id": "UAd1QXW7vm9gwoEc", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_scarf_seam_type": [ + "all" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_change_length": [ + "5" + ], + "filament_prime_volume": [ + "30" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_ramming_volumetric_speed_nc": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "10", + "10" + ], + "filament_retraction_length": [ + "1", + "1" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "first_x_layer_fan_speed": [ + "40" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_pre_cooling_temperature_nc": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_ramming_travel_time_nc": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "215", + "215" + ], + "nozzle_temperature_initial_layer": [ + "215", + "215" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "nozzle_temperature_range_low": [ + "205", + "205" + ], + "nozzle_temperature_range_high": [ + "245", + "245" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "fan_min_speed": [ + "60" + ], + "fan_max_speed": [ + "100" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "compatible_printers": [ + "Bambu Lab P2S 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json index db92a68125..52cbbd3596 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json @@ -1,210 +1,211 @@ { - "type": "filament", - "name": "INSLOGIC PLA Pro @P1-X1", - "inherits": "INSLOGIC PLA Pro @base", - "from": "system", - "setting_id": "InmXr3LoNKKDfnQu", - "instantiation": "true", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "40" - ], - "hot_plate_temp": [ - "55" - ], - "textured_plate_temp": [ - "55" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "40" - ], - "hot_plate_temp_initial_layer": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "55" - ], - "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.98", - "0.98" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_cooling_layer_time": [ - "15" - ], - "filament_density": [ - "1.2" - ], - "filament_deretraction_speed": [ - "nil", - "nil" - ], - "filament_max_volumetric_speed": [ - "12", - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_retraction_minimum_travel": [ - "nil", - "nil" - ], - "filament_retract_before_wipe": [ - "nil", - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil", - "nil" - ], - "filament_retraction_length": [ - "1", - "1" - ], - "filament_z_hop": [ - "nil", - "nil" - ], - "filament_z_hop_types": [ - "nil", - "nil" - ], - "filament_retract_restart_extra": [ - "nil", - "nil" - ], - "filament_retraction_speed": [ - "nil", - "nil" - ], - "filament_soluble": [ - "0" - ], - "filament_wipe": [ - "nil", - "nil" - ], - "filament_wipe_distance": [ - "nil", - "nil" - ], - "nozzle_temperature_initial_layer": [ - "215", - "215" - ], - "full_fan_speed_layer": [ - "2" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "60" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ], - "filament_start_gcode": [ - "; Filament gcode\n" - ], - "nozzle_temperature": [ - "215", - "215" - ], - "temperature_vitrification": [ - "70.4" - ], - "nozzle_temperature_range_low": [ - "205", - "205" - ], - "nozzle_temperature_range_high": [ - "245", - "245" - ], - "filament_flush_temp": [ - "0", - "0" - ], - "filament_flush_volumetric_speed": [ - "0", - "0" - ], - "filament_long_retractions_when_cut": [ - "0" - ], - "filament_ramming_volumetric_speed": [ - "-1", - "-1" - ], - "filament_retraction_distances_when_cut": [ - "nil", - "nil" - ], - "filament_extruder_variant": [ - "Direct Drive Standard", - "Direct Drive High Flow" - ], - "filament_pre_cooling_temperature": [ - "0", - "0" - ], - "filament_ramming_travel_time": [ - "0", - "0" - ], - "filament_adaptive_volumetric_speed": [ - "0", - "0" - ], - "long_retractions_when_ec": [ - "0", - "0" - ], - "retraction_distances_when_ec": [ - "0", - "0" - ], - "volumetric_speed_coefficients": [ - "0 0 0 0 0 0", - "0 0 0 0 0 0" - ], - "idle_temperature": [ - "0" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "compatible_printers": [ - "Bambu Lab X1 0.4 nozzle", - "Bambu Lab X1 Carbon 0.4 nozzle", - "Bambu Lab P1S 0.4 nozzle", - "Bambu Lab X1E 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PLA Pro @P1-X1", + "inherits": "INSLOGIC PLA Pro @base", + "from": "system", + "setting_id": "InmXr3LoNKKDfnQu", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "eng_plate_temp": [ + "40" + ], + "hot_plate_temp": [ + "55" + ], + "textured_plate_temp": [ + "55" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "40" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "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.98", + "0.98" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_cooling_layer_time": [ + "15" + ], + "filament_density": [ + "1.2" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_soluble": [ + "0" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "nozzle_temperature_initial_layer": [ + "215", + "215" + ], + "full_fan_speed_layer": [ + "2" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "215", + "215" + ], + "temperature_vitrification": [ + "70.4" + ], + "nozzle_temperature_range_low": [ + "205", + "205" + ], + "nozzle_temperature_range_high": [ + "245", + "245" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "idle_temperature": [ + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @base.json index 952f927479..f5eedf33d8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @base.json @@ -1,36 +1,36 @@ { - "type": "filament", - "name": "INSLOGIC PA6-66 @base", - "inherits": "fdm_filament_pa", - "from": "system", - "filament_id": "OF02mnRc", - "instantiation": "false", - "filament_vendor": [ - "INSLOGIC" - ], - "filament_type": [ - "PA" - ], - "filament_density": [ - "1.08" - ], - "filament_diameter": [ - "1.75" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_soluble": [ - "0" - ], - "nozzle_temperature_range_low": [ - "250" - ], - "nozzle_temperature_range_high": [ - "280" - ], - "filament_notes": [ - "Inslogic Nylon PA6/66 TDS (20.01.2025). Nozzle sizes 0.2/0.4/0.6mm. Nozzle 250-280C. Bed 30-50C. Printing speed 50-150mm/s. Cooling fan 100%. Textured PEI Sheet. Drying 80C for 48h or 110C for 3h. TDS linear speed is not converted to filament_max_volumetric_speed." - ], - "compatible_printers": [] + "type": "filament", + "name": "INSLOGIC PA6-66 @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OF02mnRc", + "instantiation": "false", + "filament_vendor": [ + "INSLOGIC" + ], + "filament_type": [ + "PA" + ], + "filament_density": [ + "1.08" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_soluble": [ + "0" + ], + "nozzle_temperature_range_low": [ + "250" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "filament_notes": [ + "Inslogic Nylon PA6/66 TDS (20.01.2025). Nozzle sizes 0.2/0.4/0.6mm. Nozzle 250-280C. Bed 30-50C. Printing speed 50-150mm/s. Cooling fan 100%. Textured PEI Sheet. Drying 80C for 48h or 110C for 3h. TDS linear speed is not converted to filament_max_volumetric_speed." + ], + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @base.json index cf73d10c59..07b2ca037c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @base.json @@ -1,39 +1,39 @@ { - "type": "filament", - "name": "INSLOGIC PA6-CF @base", - "inherits": "fdm_filament_pa", - "from": "system", - "filament_id": "OFDkHRsW", - "instantiation": "false", - "filament_vendor": [ - "INSLOGIC" - ], - "filament_type": [ - "PA-CF" - ], - "filament_density": [ - "1.20" - ], - "filament_diameter": [ - "1.75" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_soluble": [ - "0" - ], - "nozzle_temperature_range_low": [ - "270" - ], - "nozzle_temperature_range_high": [ - "290" - ], - "filament_notes": [ - "Inslogic PA6-CF TDS (20.01.2025). Nozzle sizes 0.4/0.6mm. Nozzle 270-290C at 50-100mm/s. Bed 50-70C. Cooling fan 30%. Textured PEI Sheet. Drying 90C for 12h or 110C for 4h. Carbon-fiber reinforced; abrasive filament. TDS linear speed is not converted to filament_max_volumetric_speed." - ], - "compatible_printers": [], - "required_nozzle_HRC": [ - "3" - ] + "type": "filament", + "name": "INSLOGIC PA6-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFDkHRsW", + "instantiation": "false", + "filament_vendor": [ + "INSLOGIC" + ], + "filament_type": [ + "PA-CF" + ], + "filament_density": [ + "1.20" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_soluble": [ + "0" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "nozzle_temperature_range_high": [ + "290" + ], + "filament_notes": [ + "Inslogic PA6-CF TDS (20.01.2025). Nozzle sizes 0.4/0.6mm. Nozzle 270-290C at 50-100mm/s. Bed 50-70C. Cooling fan 30%. Textured PEI Sheet. Drying 90C for 12h or 110C for 4h. Carbon-fiber reinforced; abrasive filament. TDS linear speed is not converted to filament_max_volumetric_speed." + ], + "compatible_printers": [], + "required_nozzle_HRC": [ + "3" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @base.json index ef0e797c2a..c5ac71e563 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @base.json @@ -1,36 +1,36 @@ { - "type": "filament", - "name": "INSLOGIC PETG Pro @base", - "inherits": "fdm_filament_pet", - "from": "system", - "filament_id": "OFBdBfg1", - "instantiation": "false", - "filament_vendor": [ - "INSLOGIC" - ], - "filament_type": [ - "PETG" - ], - "filament_density": [ - "1.26" - ], - "filament_diameter": [ - "1.75" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_soluble": [ - "0" - ], - "nozzle_temperature_range_low": [ - "230" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "filament_notes": [ - "Inslogic PETG Pro TDS (12.02.2024). Nozzle sizes 0.2/0.4/0.6mm. 230-240C at 50-100mm/s; 240-255C at 100-300mm/s; 255-270C at 300-600mm/s. Bed 60-70C. Cooling fan 100%. Bed: Smooth PEI Sheet / High Temperature Plate. Drying 50C for 4h. TDS linear speed is not converted to filament_max_volumetric_speed." - ], - "compatible_printers": [] + "type": "filament", + "name": "INSLOGIC PETG Pro @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFBdBfg1", + "instantiation": "false", + "filament_vendor": [ + "INSLOGIC" + ], + "filament_type": [ + "PETG" + ], + "filament_density": [ + "1.26" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_soluble": [ + "0" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "filament_notes": [ + "Inslogic PETG Pro TDS (12.02.2024). Nozzle sizes 0.2/0.4/0.6mm. 230-240C at 50-100mm/s; 240-255C at 100-300mm/s; 255-270C at 300-600mm/s. Bed 60-70C. Cooling fan 100%. Bed: Smooth PEI Sheet / High Temperature Plate. Drying 50C for 4h. TDS linear speed is not converted to filament_max_volumetric_speed." + ], + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @base.json index b33a37c62c..7d199cb46e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @base.json @@ -1,36 +1,36 @@ { - "type": "filament", - "name": "INSLOGIC PLA Pro @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFvPeNbA", - "instantiation": "false", - "filament_vendor": [ - "INSLOGIC" - ], - "filament_type": [ - "PLA" - ], - "filament_density": [ - "1.20" - ], - "filament_diameter": [ - "1.75" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_soluble": [ - "0" - ], - "nozzle_temperature_range_low": [ - "195" - ], - "nozzle_temperature_range_high": [ - "220" - ], - "filament_notes": [ - "Inslogic PLA Pro TDS (12.02.2024). Nozzle sizes 0.2/0.4/0.6mm. 195-205C at 50-100mm/s; 205-220C at 100-300mm/s. Bed 50-60C. Cooling fan 100%. Bed: Textured PEI Sheet / Cool Plate. Drying 50C for 4h. TDS linear speed is not converted to filament_max_volumetric_speed." - ], - "compatible_printers": [] + "type": "filament", + "name": "INSLOGIC PLA Pro @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFvPeNbA", + "instantiation": "false", + "filament_vendor": [ + "INSLOGIC" + ], + "filament_type": [ + "PLA" + ], + "filament_density": [ + "1.20" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_soluble": [ + "0" + ], + "nozzle_temperature_range_low": [ + "195" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "filament_notes": [ + "Inslogic PLA Pro TDS (12.02.2024). Nozzle sizes 0.2/0.4/0.6mm. 195-205C at 50-100mm/s; 205-220C at 100-300mm/s. Bed 50-60C. Cooling fan 100%. Bed: Textured PEI Sheet / Cool Plate. Drying 50C for 4h. TDS linear speed is not converted to filament_max_volumetric_speed." + ], + "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json index 040e1f0ff0..7fa82c8699 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json @@ -1,165 +1,165 @@ { - "type": "filament", - "name": "INSLOGIC PA6-66 @Prusa CORE One", - "inherits": "INSLOGIC PA6-66 @base", - "from": "system", - "setting_id": "Kuv4zCw8jhxYOzhB", - "instantiation": "true", - "hot_plate_temp": [ - "40" - ], - "hot_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "40" - ], - "textured_plate_temp_initial_layer": [ - "40" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "overhang_fan_speed": [ - "100" - ], - "chamber_minimal_temperature": [ - "0" - ], - "chamber_temperature": [ - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "0" - ], - "filament_end_gcode": [ - "; Filament-specific end gcode" - ], - "filament_flow_ratio": [ - "0.99" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_cooling_final_speed": [ - "3.5" - ], - "filament_cooling_initial_speed": [ - "10" - ], - "filament_cooling_moves": [ - "2" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_loading_speed": [ - "10" - ], - "filament_loading_speed_start": [ - "50" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "10" - ], - "filament_multitool_ramming_volume": [ - "10" - ], - "filament_ramming_parameters": [ - "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retract_length_toolchange": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_restart_extra_toolchange": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_stamping_distance": [ - "45" - ], - "filament_stamping_loading_speed": [ - "29" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "100" - ], - "filament_unloading_speed_start": [ - "100" - ], - "filament_wipe": [ - "nil" - ], - "nozzle_temperature_initial_layer": [ - "265" - ], - "full_fan_speed_layer": [ - "0" - ], - "idle_temperature": [ - "170" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "slow_down_min_speed": [ - "20" - ], - "slow_down_layer_time": [ - "15" - ], - "filament_start_gcode": [ - "" - ], - "nozzle_temperature": [ - "265" - ], - "compatible_printers": [ - "Prusa CORE One 0.4 nozzle", - "Prusa CORE One L 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-66 @Prusa CORE One", + "inherits": "INSLOGIC PA6-66 @base", + "from": "system", + "setting_id": "Kuv4zCw8jhxYOzhB", + "instantiation": "true", + "hot_plate_temp": [ + "40" + ], + "hot_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "40" + ], + "textured_plate_temp_initial_layer": [ + "40" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "overhang_fan_speed": [ + "100" + ], + "chamber_minimal_temperature": [ + "0" + ], + "chamber_temperature": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "0" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_flow_ratio": [ + "0.99" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "10" + ], + "filament_multitool_ramming_volume": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retract_length_toolchange": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_restart_extra_toolchange": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "100" + ], + "filament_unloading_speed_start": [ + "100" + ], + "filament_wipe": [ + "nil" + ], + "nozzle_temperature_initial_layer": [ + "265" + ], + "full_fan_speed_layer": [ + "0" + ], + "idle_temperature": [ + "170" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "15" + ], + "filament_start_gcode": [ + "" + ], + "nozzle_temperature": [ + "265" + ], + "compatible_printers": [ + "Prusa CORE One 0.4 nozzle", + "Prusa CORE One L 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json index 790650ee23..5063ee001a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json @@ -1,165 +1,165 @@ { - "type": "filament", - "name": "INSLOGIC PA6-CF @Prusa CORE One", - "inherits": "INSLOGIC PA6-CF @base", - "from": "system", - "setting_id": "ZCYSMR6VCj0IrYAF", - "instantiation": "true", - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "overhang_fan_speed": [ - "30" - ], - "chamber_minimal_temperature": [ - "0" - ], - "chamber_temperature": [ - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "0" - ], - "filament_end_gcode": [ - "; Filament-specific end gcode" - ], - "filament_flow_ratio": [ - "0.99" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_cooling_final_speed": [ - "3.5" - ], - "filament_cooling_initial_speed": [ - "10" - ], - "filament_cooling_moves": [ - "2" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_loading_speed": [ - "10" - ], - "filament_loading_speed_start": [ - "50" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "10" - ], - "filament_multitool_ramming_volume": [ - "10" - ], - "filament_ramming_parameters": [ - "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retract_length_toolchange": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_restart_extra_toolchange": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_stamping_distance": [ - "45" - ], - "filament_stamping_loading_speed": [ - "29" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "100" - ], - "filament_unloading_speed_start": [ - "100" - ], - "filament_wipe": [ - "nil" - ], - "nozzle_temperature_initial_layer": [ - "280" - ], - "full_fan_speed_layer": [ - "0" - ], - "idle_temperature": [ - "170" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "30" - ], - "slow_down_min_speed": [ - "20" - ], - "slow_down_layer_time": [ - "15" - ], - "filament_start_gcode": [ - "" - ], - "nozzle_temperature": [ - "280" - ], - "compatible_printers": [ - "Prusa CORE One 0.4 nozzle", - "Prusa CORE One L 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PA6-CF @Prusa CORE One", + "inherits": "INSLOGIC PA6-CF @base", + "from": "system", + "setting_id": "ZCYSMR6VCj0IrYAF", + "instantiation": "true", + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "overhang_fan_speed": [ + "30" + ], + "chamber_minimal_temperature": [ + "0" + ], + "chamber_temperature": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "0" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_flow_ratio": [ + "0.99" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "10" + ], + "filament_multitool_ramming_volume": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retract_length_toolchange": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_restart_extra_toolchange": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "100" + ], + "filament_unloading_speed_start": [ + "100" + ], + "filament_wipe": [ + "nil" + ], + "nozzle_temperature_initial_layer": [ + "280" + ], + "full_fan_speed_layer": [ + "0" + ], + "idle_temperature": [ + "170" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "30" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "15" + ], + "filament_start_gcode": [ + "" + ], + "nozzle_temperature": [ + "280" + ], + "compatible_printers": [ + "Prusa CORE One 0.4 nozzle", + "Prusa CORE One L 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json index 6eb05df53d..70465325c1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json @@ -1,165 +1,165 @@ { - "type": "filament", - "name": "INSLOGIC PETG Pro @Prusa CORE One", - "inherits": "INSLOGIC PETG Pro @base", - "from": "system", - "setting_id": "yHUGQJhN0HUa7A5V", - "instantiation": "true", - "hot_plate_temp": [ - "65" - ], - "hot_plate_temp_initial_layer": [ - "65" - ], - "textured_plate_temp": [ - "65" - ], - "textured_plate_temp_initial_layer": [ - "65" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "overhang_fan_speed": [ - "100" - ], - "chamber_minimal_temperature": [ - "0" - ], - "chamber_temperature": [ - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "0" - ], - "filament_end_gcode": [ - "; Filament-specific end gcode" - ], - "filament_flow_ratio": [ - "0.99" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_cooling_final_speed": [ - "3.5" - ], - "filament_cooling_initial_speed": [ - "10" - ], - "filament_cooling_moves": [ - "2" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_loading_speed": [ - "10" - ], - "filament_loading_speed_start": [ - "50" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "10" - ], - "filament_multitool_ramming_volume": [ - "10" - ], - "filament_ramming_parameters": [ - "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retract_length_toolchange": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_restart_extra_toolchange": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_stamping_distance": [ - "45" - ], - "filament_stamping_loading_speed": [ - "29" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "100" - ], - "filament_unloading_speed_start": [ - "100" - ], - "filament_wipe": [ - "nil" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "full_fan_speed_layer": [ - "0" - ], - "idle_temperature": [ - "170" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "slow_down_min_speed": [ - "20" - ], - "slow_down_layer_time": [ - "15" - ], - "filament_start_gcode": [ - "" - ], - "nozzle_temperature": [ - "250" - ], - "compatible_printers": [ - "Prusa CORE One 0.4 nozzle", - "Prusa CORE One L 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PETG Pro @Prusa CORE One", + "inherits": "INSLOGIC PETG Pro @base", + "from": "system", + "setting_id": "yHUGQJhN0HUa7A5V", + "instantiation": "true", + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "overhang_fan_speed": [ + "100" + ], + "chamber_minimal_temperature": [ + "0" + ], + "chamber_temperature": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "0" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_flow_ratio": [ + "0.99" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "10" + ], + "filament_multitool_ramming_volume": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retract_length_toolchange": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_restart_extra_toolchange": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "100" + ], + "filament_unloading_speed_start": [ + "100" + ], + "filament_wipe": [ + "nil" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "full_fan_speed_layer": [ + "0" + ], + "idle_temperature": [ + "170" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "15" + ], + "filament_start_gcode": [ + "" + ], + "nozzle_temperature": [ + "250" + ], + "compatible_printers": [ + "Prusa CORE One 0.4 nozzle", + "Prusa CORE One L 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json index f670bd71b0..6330d188c8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json @@ -1,165 +1,165 @@ { - "type": "filament", - "name": "INSLOGIC PLA Pro @Prusa CORE One", - "inherits": "INSLOGIC PLA Pro @base", - "from": "system", - "setting_id": "Qkscha5uuuFXbvbB", - "instantiation": "true", - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "55" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "55" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "overhang_fan_speed": [ - "100" - ], - "chamber_minimal_temperature": [ - "0" - ], - "chamber_temperature": [ - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "0" - ], - "filament_end_gcode": [ - "; Filament-specific end gcode" - ], - "filament_flow_ratio": [ - "0.99" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_cooling_final_speed": [ - "3.5" - ], - "filament_cooling_initial_speed": [ - "10" - ], - "filament_cooling_moves": [ - "2" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_loading_speed": [ - "10" - ], - "filament_loading_speed_start": [ - "50" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "10" - ], - "filament_multitool_ramming_volume": [ - "10" - ], - "filament_ramming_parameters": [ - "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retract_length_toolchange": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_restart_extra_toolchange": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_stamping_distance": [ - "45" - ], - "filament_stamping_loading_speed": [ - "29" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "100" - ], - "filament_unloading_speed_start": [ - "100" - ], - "filament_wipe": [ - "nil" - ], - "nozzle_temperature_initial_layer": [ - "210" - ], - "full_fan_speed_layer": [ - "0" - ], - "idle_temperature": [ - "170" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "slow_down_min_speed": [ - "20" - ], - "slow_down_layer_time": [ - "15" - ], - "filament_start_gcode": [ - "" - ], - "nozzle_temperature": [ - "210" - ], - "compatible_printers": [ - "Prusa CORE One 0.4 nozzle", - "Prusa CORE One L 0.4 nozzle" - ] + "type": "filament", + "name": "INSLOGIC PLA Pro @Prusa CORE One", + "inherits": "INSLOGIC PLA Pro @base", + "from": "system", + "setting_id": "Qkscha5uuuFXbvbB", + "instantiation": "true", + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "overhang_fan_speed": [ + "100" + ], + "chamber_minimal_temperature": [ + "0" + ], + "chamber_temperature": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "0" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_flow_ratio": [ + "0.99" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "10" + ], + "filament_multitool_ramming_volume": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retract_length_toolchange": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_restart_extra_toolchange": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "100" + ], + "filament_unloading_speed_start": [ + "100" + ], + "filament_wipe": [ + "nil" + ], + "nozzle_temperature_initial_layer": [ + "210" + ], + "full_fan_speed_layer": [ + "0" + ], + "idle_temperature": [ + "170" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "15" + ], + "filament_start_gcode": [ + "" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Prusa CORE One 0.4 nozzle", + "Prusa CORE One L 0.4 nozzle" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json index 12fc28a3b3..d564918a1e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json @@ -11,39 +11,50 @@ "Bambu Lab X1 0.8 nozzle" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ "15" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_start_gcode": [ @@ -53,18 +64,23 @@ "40" ], "filament_flush_temp": [ + "0", "0" ], "filament_flush_volumetric_speed": [ + "0", "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_ramming_volumetric_speed": [ + "-1", "-1" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_extruder_variant": [ @@ -72,21 +88,27 @@ "Direct Drive High Flow" ], "filament_pre_cooling_temperature": [ + "0", "0" ], "filament_ramming_travel_time": [ + "0", "0" ], "filament_adaptive_volumetric_speed": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", "0 0 0 0 0 0" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json index c5e97344e6..4d06956b11 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json @@ -7,6 +7,7 @@ "filament_id": "OFzk5oAo", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json index a6cec42f4a..7bc7435c74 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json @@ -7,6 +7,7 @@ "filament_id": "OFSw6Mor", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.99", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json index 1c072f99b1..b33951c7ba 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json @@ -7,6 +7,7 @@ "filament_id": "OFWK0Y9A", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.99", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json index b07d89b749..9f938e51e9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json @@ -7,6 +7,7 @@ "filament_id": "OFBsbMMF", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.99", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json index a0a967026e..352bd80ac6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json @@ -7,6 +7,7 @@ "filament_id": "OF1ID4N1", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.99", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json index 2a4219ef1d..839c055ebf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json @@ -7,6 +7,7 @@ "filament_id": "OFhN09f0", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json index 2f4206faea..f2e5824c14 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json @@ -7,6 +7,7 @@ "filament_id": "OFHHwrd1", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json index 1cafba7a4e..1074484973 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json @@ -7,6 +7,7 @@ "filament_id": "OFUtiVRn", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.97", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json index 17f23ee8b3..3747f7a86f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json @@ -7,6 +7,7 @@ "filament_id": "OFZGrQTU", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json index 3a83fffcdc..7dea674787 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json @@ -7,6 +7,7 @@ "filament_id": "OF0EYBWQ", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.97", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json index b894fad112..8dc175d8e1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json @@ -7,6 +7,7 @@ "filament_id": "OFU5JPDy", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json index fc7470096e..0454a13f5c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json @@ -7,6 +7,7 @@ "filament_id": "OFqTwtXM", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json index 70d3df17cf..024faed63d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json @@ -7,6 +7,7 @@ "filament_id": "OFAcJkl1", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.95", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json index 783ee6ccd1..1f6892b815 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json @@ -7,6 +7,7 @@ "filament_id": "OF71b7qO", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json index 84a22a9a60..ccacef16f4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json @@ -7,6 +7,7 @@ "filament_id": "OFZJft47", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json index f3236b5d5a..aa466f3c3e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json @@ -7,6 +7,7 @@ "filament_id": "OFVDWuxl", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json index f1bf250692..f794753c4a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json @@ -7,6 +7,7 @@ "filament_id": "OFOQCfVa", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "1", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json index 218bb0f6af..73cfea81a4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json @@ -7,6 +7,7 @@ "filament_id": "OFRFhdqy", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json index d4c4c4c04f..5d64f416b7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json @@ -7,6 +7,7 @@ "filament_id": "OFN8QBhu", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json index 939a8301fb..d752b3adaf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json @@ -7,6 +7,7 @@ "filament_id": "OFLjDYxH", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json index 075ab03f46..2deaf8d323 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json @@ -7,6 +7,7 @@ "filament_id": "OFtdVZpV", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json index 771869bc04..5ef8ccc6b6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json @@ -7,6 +7,7 @@ "filament_id": "OFnBvPhb", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "0.98", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json index 584d049776..608d67a5bd 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json @@ -7,6 +7,7 @@ "filament_id": "OFQ5TxZ2", "instantiation": "true", "activate_air_filtration": [ + "1", "1" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "1", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json index f75218b666..25f2c310db 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json @@ -7,6 +7,7 @@ "filament_id": "OFO6GMJ3", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "1", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json index 446377b7c4..a922a91ba1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json @@ -7,6 +7,7 @@ "filament_id": "OFvcIGee", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "1", @@ -189,6 +193,7 @@ "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json index b63da895a8..80c80328e8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json @@ -7,6 +7,7 @@ "filament_id": "OFyJjkek", "instantiation": "true", "activate_air_filtration": [ + "0", "0" ], "additional_cooling_fan_speed": [ @@ -72,6 +73,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -102,6 +104,7 @@ "50" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ @@ -148,7 +151,8 @@ "; filament end gcode \n" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_flow_ratio": [ "1", diff --git a/resources/profiles/Peopoly.json b/resources/profiles/Peopoly.json index 9b95c24bb3..21ae6bdb93 100644 --- a/resources/profiles/Peopoly.json +++ b/resources/profiles/Peopoly.json @@ -1,6 +1,6 @@ { "name": "Peopoly", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Peopoly configurations", "machine_model_list": [ diff --git a/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json b/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json index d9e2ae777c..9342bcb63c 100644 --- a/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json +++ b/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Peopoly", - "inherits": "fdm_filament_abs", "renamed_from": "Peopoly Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "HLq9urLhPLW0du6x", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json b/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json index fc4501866a..0d21a46002 100644 --- a/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json +++ b/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Peopoly", - "inherits": "fdm_filament_petg", "renamed_from": "Peopoly Generic PETG", + "inherits": "fdm_filament_petg", "from": "system", "setting_id": "dgMXFTyLovrMR56j", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Phrozen.json b/resources/profiles/Phrozen.json index f07568bb29..ef10047de6 100644 --- a/resources/profiles/Phrozen.json +++ b/resources/profiles/Phrozen.json @@ -1,6 +1,6 @@ { "name": "Phrozen", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Phrozen configurations", "machine_model_list": [ diff --git a/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json b/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json index c53abee956..63c6d76ba0 100644 --- a/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json +++ b/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "xTeHmDOY48Bik10J", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_settings_id": [ "Generic PLA @Phrozen Arco 0.4 nozzle" ], diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index e16e2d3be3..c0c6ce2f4e 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "02.04.00.08", + "version": "02.04.00.09", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json index 8ba18e9dde..8493c75c81 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One 0.6", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One 0.6;Prusa Generic ABS CORE One 0.6", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "PYQhstNvKFJ7qsxe", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json index 2981c2ef63..cc8322476d 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One 0.8", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One 0.8;Prusa Generic ABS CORE One 0.8", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "ExG49agessyLCVpW", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json index f2e61055ab..caf36dc7d1 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One HF 0.4", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One HF 0.4;Prusa Generic ABS CORE One HF 0.4", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "ASYz8yASE82tQDII", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json index 14782a747a..4d0ae20a33 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One HF 0.5", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One HF 0.5;Prusa Generic ABS CORE One HF 0.5", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "mzZCm8XDmAR23YR6", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json index be46455a73..6419e2a9d4 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One HF 0.6", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One HF 0.6;Prusa Generic ABS CORE One HF 0.6", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "gJhX2KBpk4wfXIj0", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json index f4d2954ad7..84913947af 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One HF 0.8", - "inherits": "Generic ABS @Prusa CORE One", "renamed_from": "Prusa Generic ABS @CORE One HF 0.8;Prusa Generic ABS CORE One HF 0.8", + "inherits": "Generic ABS @Prusa CORE One", "from": "system", "setting_id": "JbGYSVdZTeFJXaVk", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json index 7339d20a7c..146903ac55 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa CORE One", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @CORE One;Prusa Generic ABS CORE One", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0k31oXq1pLQsHvrj", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json index 0fe673d854..23709aa9a8 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MINIIS 0.25", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS @MINIIS 0.25;Prusa Generic ABS MINIIS 0.25", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "T7U23i3I3ALV2oEd", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json index 3b9fa495e3..41dc794378 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MINIIS 0.6", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS @MINIIS 0.6;Prusa Generic ABS MINIIS 0.6", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "iZdNxczgKBs0zIiI", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json index e9d5d7554b..71a6e81ce3 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MINIIS 0.8", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS @MINIIS 0.8;Prusa Generic ABS MINIIS 0.8", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "f6fZt6LNgXSHjInj", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json index 9f6569d6e9..f32d65f4b7 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MINIIS", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS @MINIIS;Prusa Generic ABS MINIIS", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "ZqiVOVIYGAbB1SPk", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json index 0a36c04f02..48f60ab2be 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK3.5 0.25", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @MK3.5 0.25;Prusa Generic ABS MK3.5 0.25", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "IjZS8VJrGg6fRiI2", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json index 04626e6ad8..853478b06e 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK3.5 0.6", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @MK3.5 0.6;Prusa Generic ABS MK3.5 0.6", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "iJ2u6LgWCZd2zaPJ", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json index 4e65b7e329..dde209cb04 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK3.5 0.8", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @MK3.5 0.8;Prusa Generic ABS MK3.5 0.8", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "m8neIe1dfWt5Klbq", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json index 075e055e72..bdd0f313ea 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK3.5", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @MK3.5;Prusa Generic ABS MK3.5", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "EEc6F9uzIkv6nFib", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json index 9ab147b678..a6fc0f89da 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS @MK4;Prusa Generic ABS MK4", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "MVcRPldYJo5fnXh8", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json index 7371c1f2f9..9e27724462 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S 0.6", - "inherits": "Generic ABS @Prusa MK4S", "renamed_from": "Prusa Generic ABS @MK4S 0.6;Prusa Generic ABS MK4S 0.6", + "inherits": "Generic ABS @Prusa MK4S", "from": "system", "setting_id": "aNRfxkoYTEG3NPV1", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json index bf0e8419cf..72718602a4 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S 0.8", - "inherits": "Generic ABS @Prusa MK4S", "renamed_from": "Prusa Generic ABS @MK4S 0.8;Prusa Generic ABS MK4S 0.8", + "inherits": "Generic ABS @Prusa MK4S", "from": "system", "setting_id": "sL7NL7GOf52fzxnj", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json index 84aca85d1a..c0e2cd5932 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S HF0.4", - "inherits": "Generic ABS @Prusa MK4S", "renamed_from": "Prusa Generic ABS @MK4S HF0.4;Prusa Generic ABS MK4S HF0.4", + "inherits": "Generic ABS @Prusa MK4S", "from": "system", "setting_id": "usm5Dycg7z1b1o1v", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json index cb9f3ccebc..6b5706180e 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S HF0.5", - "inherits": "Generic ABS @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ABS @MK4S HF0.5;Prusa Generic ABS MK4S HF0.5", + "inherits": "Generic ABS @Prusa MK4S HF0.4", "from": "system", "setting_id": "EdrmoUsReFVn5EWW", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json index 2327e2d1cc..2de8b74683 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S HF0.6", - "inherits": "Generic ABS @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ABS @MK4S HF0.6;Prusa Generic ABS MK4S HF0.6", + "inherits": "Generic ABS @Prusa MK4S HF0.4", "from": "system", "setting_id": "lcxvk4AN6z8NGdKv", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json index 81bf85e41c..104c612597 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S HF0.8", - "inherits": "Generic ABS @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ABS @MK4S HF0.8;Prusa Generic ABS MK4S HF0.8", + "inherits": "Generic ABS @Prusa MK4S HF0.4", "from": "system", "setting_id": "VTSZGauVB9yGzOJD", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json index c454e1d79b..2809ff16e9 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa MK4S", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS @MK4S;Prusa Generic ABS MK4S", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "6xkFvOyWtTQNXYAm", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json index 0c10f8f297..6747d42b45 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Prusa", - "inherits": "Generic ABS @Prusa base", "renamed_from": "Prusa Generic ABS", + "inherits": "Generic ABS @Prusa base", "from": "system", "setting_id": "RBSSZVt1NCAz4x3V", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json index 071e689280..c6390f9d8d 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MINIIS 0.6", - "inherits": "Generic ABS HF @Prusa base", "renamed_from": "Prusa Generic ABS HF @MINIIS 0.6;Prusa Generic ABS HF MINIIS 0.6", + "inherits": "Generic ABS HF @Prusa base", "from": "system", "setting_id": "L6copDR26trR0D8B", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json index ca0b250240..a52f9f3f40 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MINIIS 0.8", - "inherits": "Generic ABS HF @Prusa base", "renamed_from": "Prusa Generic ABS HF @MINIIS 0.8;Prusa Generic ABS HF MINIIS 0.8", + "inherits": "Generic ABS HF @Prusa base", "from": "system", "setting_id": "oxiwspATW960u3eZ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json index 6acc1844e7..b845f03d4d 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MINIIS", - "inherits": "Generic ABS HF @Prusa base", "renamed_from": "Prusa Generic ABS HF @MINIIS;Prusa Generic ABS HF MINIIS", + "inherits": "Generic ABS HF @Prusa base", "from": "system", "setting_id": "KcRRWqB7hrovzBng", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json index 5e446b1507..2dbab6b643 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS HF @MK3.5 0.6;Prusa Generic ABS HF MK3.5 0.6", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ELwxwCcaOKeCUqoB", "filament_id": "OF55jHAJ", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json index e5f48f3390..4a0a033087 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS HF @MK3.5 0.8;Prusa Generic ABS HF MK3.5 0.8", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "xWMzscdlR6llxFKQ", "filament_id": "OF55jHAJ", diff --git a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json index 9c1f224149..f814613ec2 100644 --- a/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HF @Prusa MK3.5", - "inherits": "fdm_filament_abs", "renamed_from": "Prusa Generic ABS HF @MK3.5;Prusa Generic ABS HF MK3.5", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "n9Xu8L69l5rs6VZF", "filament_id": "OF55jHAJ", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json index 0fa54a9d21..15413c6ac0 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One 0.6", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One 0.6;Prusa Generic ASA CORE One 0.6", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "WJzGT568OrlSqxjt", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json index db78ff7eeb..008cbbc758 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One 0.8", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One 0.8;Prusa Generic ASA CORE One 0.8", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "VtxVQIuWVkP6W3aN", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json index 18a1b68fb3..825a3de691 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One HF 0.4", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One HF 0.4;Prusa Generic ASA CORE One HF 0.4", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "eKDfiVRE59itoppm", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json index dd7c08b25f..86dec35130 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One HF 0.5", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One HF 0.5;Prusa Generic ASA CORE One HF 0.5", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "ZjHf5Vvtf4ESNnWb", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json index 7ca03b1c37..e3de3e1d3d 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One HF 0.6", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One HF 0.6;Prusa Generic ASA CORE One HF 0.6", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "aRDgUgQJWdNDJx5c", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json index 7fe2a7d8bf..c8d78a0e69 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One HF 0.8", - "inherits": "Generic ASA @Prusa CORE One", "renamed_from": "Prusa Generic ASA @CORE One HF 0.8;Prusa Generic ASA CORE One HF 0.8", + "inherits": "Generic ASA @Prusa CORE One", "from": "system", "setting_id": "UQYl8pGvqg2D9zJX", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json index 84fe0fa3d9..853b1e0803 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa CORE One", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @CORE One;Prusa Generic ASA CORE One", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Q7fgojkHRZI0floy", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json index 8aeaefd5c8..b4f7bbc063 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MINIIS 0.25", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MINIIS 0.25;Prusa Generic ASA MINIIS 0.25", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "3k53bfrhLAnuxHQo", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json index 46cf4ee835..b52d104a19 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MINIIS 0.6", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MINIIS 0.6;Prusa Generic ASA MINIIS 0.6", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "NMILNvvq88zkz2Lf", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json index 2e96b0d886..2f968e4792 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MINIIS 0.8", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MINIIS 0.8;Prusa Generic ASA MINIIS 0.8", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "lnjqcRttOW0XRGe2", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json index add2390249..01270df239 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MINIIS", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MINIIS;Prusa Generic ASA MINIIS", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "53FptNgFYqTPZfkV", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json index ddf9c2d380..c97d7ae278 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK3.5 0.25", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK3.5 0.25;Prusa Generic ASA MK3.5 0.25", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "zyUCfzPlsqRZiUvj", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json index 0bcbf559e4..3e11e59a68 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK3.5 0.6", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK3.5 0.6;Prusa Generic ASA MK3.5 0.6", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "AjpsLZCJaPLfpGdv", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json index 2ca5decddd..e92daf0a82 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK3.5 0.8", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK3.5 0.8;Prusa Generic ASA MK3.5 0.8", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "UwiRVbIWfsSjXcwV", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json index 61eed484a1..2bbcdd5b2a 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK3.5", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK3.5;Prusa Generic ASA MK3.5", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "BA46zZsxlvH5bdbC", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json index bf6998903d..2afc566d7b 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK4;Prusa Generic ASA MK4", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "3HdBZTnRTu6aKN1e", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json index 15d5cb17a8..378d3eb14b 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S 0.6", - "inherits": "Generic ASA @Prusa MK4S", "renamed_from": "Prusa Generic ASA @MK4S 0.6;Prusa Generic ASA MK4S 0.6", + "inherits": "Generic ASA @Prusa MK4S", "from": "system", "setting_id": "gtPmGmeYUKi7hwVI", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json index 5af8faecb8..54710e830a 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S 0.8", - "inherits": "Generic ASA @Prusa MK4S", "renamed_from": "Prusa Generic ASA @MK4S 0.8;Prusa Generic ASA MK4S 0.8", + "inherits": "Generic ASA @Prusa MK4S", "from": "system", "setting_id": "a0IXdYic1FVnKaJg", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json index 033ca2b942..4ce726bbe0 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S HF0.4", - "inherits": "Generic ASA @Prusa MK4S", "renamed_from": "Prusa Generic ASA @MK4S HF0.4;Prusa Generic ASA MK4S HF0.4", + "inherits": "Generic ASA @Prusa MK4S", "from": "system", "setting_id": "INXVBsLNAkRQUlPU", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json index fe96876ce6..64352c5df0 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S HF0.5", - "inherits": "Generic ASA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ASA @MK4S HF0.5;Prusa Generic ASA MK4S HF0.5", + "inherits": "Generic ASA @Prusa MK4S HF0.4", "from": "system", "setting_id": "g7VYJJrBS9mmbJOi", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json index 56c2ff76e0..d167d8e54e 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S HF0.6", - "inherits": "Generic ASA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ASA @MK4S HF0.6;Prusa Generic ASA MK4S HF0.6", + "inherits": "Generic ASA @Prusa MK4S HF0.4", "from": "system", "setting_id": "yDj1rzyRIOYJM4Pp", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json index be3eeb1fe4..ed1b0939dc 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S HF0.8", - "inherits": "Generic ASA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic ASA @MK4S HF0.8;Prusa Generic ASA MK4S HF0.8", + "inherits": "Generic ASA @Prusa MK4S HF0.4", "from": "system", "setting_id": "HF59RnyQo2wt5act", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json index 80ba2d523b..a8f931c1c6 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa MK4S", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA @MK4S;Prusa Generic ASA MK4S", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "THc7WYsGi7nwc5wv", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json index 19d7553977..e8df9c7e12 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Prusa", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Uff8hd9OkoS2Yly7", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json index a8806ff0c6..4eba0eaf3f 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MINIIS 0.6", - "inherits": "Generic ASA HF @Prusa base", "renamed_from": "Prusa Generic ASA HF @MINIIS 0.6;Prusa Generic ASA HF MINIIS 0.6", + "inherits": "Generic ASA HF @Prusa base", "from": "system", "setting_id": "Xswtt3GpBabtxN4h", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json index cceae0087a..61e088ac76 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MINIIS 0.8", - "inherits": "Generic ASA HF @Prusa base", "renamed_from": "Prusa Generic ASA HF @MINIIS 0.8;Prusa Generic ASA HF MINIIS 0.8", + "inherits": "Generic ASA HF @Prusa base", "from": "system", "setting_id": "z13Q2CqpzsnazYwI", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json index 4a9bb2b877..2f9e4d232a 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MINIIS", - "inherits": "Generic ASA HF @Prusa base", "renamed_from": "Prusa Generic ASA HF @MINIIS;Prusa Generic ASA HF MINIIS", + "inherits": "Generic ASA HF @Prusa base", "from": "system", "setting_id": "zzMFtHrjmImnj77f", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json index e62013867c..a9f7e9941b 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA HF @MK3.5 0.6;Prusa Generic ASA HF MK3.5 0.6", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "lhsnnKDQp3U8enP3", "filament_id": "OFzRtFM9", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json index 74d0b8a4dc..15c68eb01e 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA HF @MK3.5 0.8;Prusa Generic ASA HF MK3.5 0.8", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Qb9bphdgmmLKHgnC", "filament_id": "OFzRtFM9", diff --git a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json index b5675c32a0..ecbec14fc8 100644 --- a/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA HF @Prusa MK3.5", - "inherits": "fdm_filament_asa", "renamed_from": "Prusa Generic ASA HF @MK3.5;Prusa Generic ASA HF MK3.5", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "C9YvhnKeHonpemK8", "filament_id": "OFzRtFM9", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json index f887a7caca..e78ac3fe42 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MINIIS 0.25", - "inherits": "Generic PA @Prusa base", "renamed_from": "Prusa Generic PA @MINIIS 0.25;Prusa Generic PA MINIIS 0.25", + "inherits": "Generic PA @Prusa base", "from": "system", "setting_id": "zONIDmAy6bC6rkBd", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json index fce5c4f837..91cd7ac4b6 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MINIIS 0.6", - "inherits": "Generic PA @Prusa base", "renamed_from": "Prusa Generic PA @MINIIS 0.6;Prusa Generic PA MINIIS 0.6", + "inherits": "Generic PA @Prusa base", "from": "system", "setting_id": "Ib0bThHzZ0GXWgXv", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json index 35c7df7919..764287a488 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MINIIS 0.8", - "inherits": "Generic PA @Prusa base", "renamed_from": "Prusa Generic PA @MINIIS 0.8;Prusa Generic PA MINIIS 0.8", + "inherits": "Generic PA @Prusa base", "from": "system", "setting_id": "WSCkyvdqYKalsLHg", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json index 67e59c92d9..fb8f18d875 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MINIIS", - "inherits": "Generic PA @Prusa base", "renamed_from": "Prusa Generic PA @MINIIS;Prusa Generic PA MINIIS", + "inherits": "Generic PA @Prusa base", "from": "system", "setting_id": "06VxUw37OfEzaSka", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json index eebbafe187..f4dad0fb8d 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA @MK3.5 0.25;Prusa Generic PA MK3.5 0.25", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "htgSl4rIQ1smRBy4", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json index 6405d18e56..d23262e4e9 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA @MK3.5 0.6;Prusa Generic PA MK3.5 0.6", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "LPzPJN0XdHVQDEsd", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json index d85d70d810..773aa08aaa 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA @MK3.5 0.8;Prusa Generic PA MK3.5 0.8", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "WiO6dm6LbzJxOC9j", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json index f3309fd275..a089d00fb2 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa MK3.5", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA @MK3.5;Prusa Generic PA MK3.5", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "YfGmmjqpxHcDcRsk", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Prusa/filament/Generic PA @Prusa.json b/resources/profiles/Prusa/filament/Generic PA @Prusa.json index 1ebaec2fe2..d6d2f33cd8 100644 --- a/resources/profiles/Prusa/filament/Generic PA @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Prusa", - "inherits": "Generic PA @Prusa base", "renamed_from": "Prusa Generic PA", + "inherits": "Generic PA @Prusa base", "from": "system", "setting_id": "zTnz1NYXoXxIHhRv", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json index 85ae694018..15c69ed420 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MINIIS 0.25", - "inherits": "Generic PA-CF @Prusa base", "renamed_from": "Prusa Generic PA-CF @MINIIS 0.25;Prusa Generic PA-CF MINIIS 0.25", + "inherits": "Generic PA-CF @Prusa base", "from": "system", "setting_id": "5OyMl43GFDPQHrx3", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json index e986346eee..d9340c7895 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MINIIS 0.6", - "inherits": "Generic PA-CF @Prusa base", "renamed_from": "Prusa Generic PA-CF @MINIIS 0.6;Prusa Generic PA-CF MINIIS 0.6", + "inherits": "Generic PA-CF @Prusa base", "from": "system", "setting_id": "lvYPxwHzVnW29IKZ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json index 1e3dd13b49..fdaed32273 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MINIIS 0.8", - "inherits": "Generic PA-CF @Prusa base", "renamed_from": "Prusa Generic PA-CF @MINIIS 0.8;Prusa Generic PA-CF MINIIS 0.8", + "inherits": "Generic PA-CF @Prusa base", "from": "system", "setting_id": "LlGpiQAvrrd5bMCs", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json index 6c59be3227..f8bd971d8e 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MINIIS", - "inherits": "Generic PA-CF @Prusa base", "renamed_from": "Prusa Generic PA-CF @MINIIS;Prusa Generic PA-CF MINIIS", + "inherits": "Generic PA-CF @Prusa base", "from": "system", "setting_id": "AfQLoOulI6zwAZDg", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json index 8f0622e2cc..6ff68fc59f 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA-CF @MK3.5 0.25;Prusa Generic PA-CF MK3.5 0.25", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "15pNQLVuXkSI3zjU", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json index bb6fc654ad..5db76e8298 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA-CF @MK3.5 0.6;Prusa Generic PA-CF MK3.5 0.6", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "3ZKi2gcV6LgJwidS", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json index 2ad7d45932..ec0c9e725e 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA-CF @MK3.5 0.8;Prusa Generic PA-CF MK3.5 0.8", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Ilehw0Za73eW1Z9v", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json index 4150a3f625..e5d4621196 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa MK3.5", - "inherits": "fdm_filament_pa", "renamed_from": "Prusa Generic PA-CF @MK3.5;Prusa Generic PA-CF MK3.5", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "yy2FgYPLARliAAmZ", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json index f60463913f..74b6736fb2 100644 --- a/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Prusa", - "inherits": "Generic PA-CF @Prusa base", "renamed_from": "Prusa Generic PA-CF", + "inherits": "Generic PA-CF @Prusa base", "from": "system", "setting_id": "R2WthJ8gqw8xdajn", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json index 4c50bdca0c..591f5502ad 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MINIIS 0.25", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MINIIS 0.25;Prusa Generic PC MINIIS 0.25", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "v5LHPemQZ8fEQJrX", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json index f6e67d5d5e..4fb6967e5c 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MINIIS 0.6", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MINIIS 0.6;Prusa Generic PC MINIIS 0.6", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "MOLOCn9YKfvHMmOu", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json index ecfa0c6fea..272adbb49c 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MINIIS 0.8", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MINIIS 0.8;Prusa Generic PC MINIIS 0.8", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "eJ9SwUbq1VyHBciM", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json index 088f2be363..dfdd628760 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MINIIS", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MINIIS;Prusa Generic PC MINIIS", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "2QWF3WdcbA7ArFgt", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json index dd823e700d..db337c60b1 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MK3.5 0.25;Prusa Generic PC MK3.5 0.25", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "MWiCzFnPAeMCWxHz", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json index b33d32e71d..64e7a63dbe 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MK3.5 0.6;Prusa Generic PC MK3.5 0.6", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "KEgDSg0oQi1SQlst", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json index a6fa27ed6d..2564c36995 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MK3.5 0.8;Prusa Generic PC MK3.5 0.8", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "LHNmoFsylIuepyww", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json index 1891e65703..5a30930fa6 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa MK3.5", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC @MK3.5;Prusa Generic PC MK3.5", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "awF5u8ojSKhvSYud", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC @Prusa.json b/resources/profiles/Prusa/filament/Generic PC @Prusa.json index 59b97e22e5..c9048035b7 100644 --- a/resources/profiles/Prusa/filament/Generic PC @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Prusa", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "UJ5KpqIb5mpcNXzl", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json index dbd6cb209f..37b44b73e6 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MINIIS 0.6", - "inherits": "Generic PC HF @Prusa base", "renamed_from": "Prusa Generic PC HF @MINIIS 0.6;Prusa Generic PC HF MINIIS 0.6", + "inherits": "Generic PC HF @Prusa base", "from": "system", "setting_id": "W3G94E0IQo6Kaq8G", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json index 53bc9b96bd..941e0ef406 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MINIIS 0.8", - "inherits": "Generic PC HF @Prusa base", "renamed_from": "Prusa Generic PC HF @MINIIS 0.8;Prusa Generic PC HF MINIIS 0.8", + "inherits": "Generic PC HF @Prusa base", "from": "system", "setting_id": "Fjwchj1gB62f7CUF", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json index 4d0785504f..a25fdc2957 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MINIIS", - "inherits": "Generic PC HF @Prusa base", "renamed_from": "Prusa Generic PC HF @MINIIS;Prusa Generic PC HF MINIIS", + "inherits": "Generic PC HF @Prusa base", "from": "system", "setting_id": "Wodqshgvx38zWaE2", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json index cb2ad5f37c..00b780d238 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC HF @MK3.5 0.6;Prusa Generic PC HF MK3.5 0.6", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "Rm7U967jnpk74lPA", "filament_id": "OFwwAQnA", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json index 0f684bcca8..74ed4537d9 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC HF @MK3.5 0.8;Prusa Generic PC HF MK3.5 0.8", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "zFkWWW3PTBvuUWqs", "filament_id": "OFwwAQnA", diff --git a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json index aa007446ce..f6dcd5d539 100644 --- a/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC HF @Prusa MK3.5", - "inherits": "fdm_filament_pc", "renamed_from": "Prusa Generic PC HF @MK3.5;Prusa Generic PC HF MK3.5", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "lvbcRP0xEru9jmms", "filament_id": "OFwwAQnA", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json index a2f899e88f..4f53e75d4e 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One 0.6", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One 0.6;Prusa Generic PETG CORE One 0.6", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "oPWpCDB3p6hQeY2F", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json index 669cf219fc..6e05f1a34c 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One 0.8", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One 0.8;Prusa Generic PETG CORE One 0.8", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "OmaayFCLuRLadur0", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json index 6c9ff68c89..510e1d2baf 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One HF 0.4", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One HF 0.4;Prusa Generic PETG CORE One HF 0.4", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "7oUyjvRHLH4bJyX0", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json index 8784e403ab..f28f5f10a3 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One HF 0.5", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One HF 0.5;Prusa Generic PETG CORE One HF 0.5", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "6HiIOGURZWwman1l", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json index c0eb6a594f..53dd49907d 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One HF 0.6", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One HF 0.6;Prusa Generic PETG CORE One HF 0.6", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "KKiug7A9NOQPe1m7", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json index 99748978bf..fc9ac8b755 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One HF 0.8", - "inherits": "Generic PETG @Prusa CORE One", "renamed_from": "Prusa Generic PETG @CORE One HF 0.8;Prusa Generic PETG CORE One HF 0.8", + "inherits": "Generic PETG @Prusa CORE One", "from": "system", "setting_id": "vtiAC44hrmtap0Ou", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json index a086fb9336..1c940b74b1 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa CORE One", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @CORE One;Prusa Generic PETG CORE One", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "W71PW5bpf7CV16D4", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json index 282048f6a3..a6e262c483 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MINIIS 0.25", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG @MINIIS 0.25;Prusa Generic PETG MINIIS 0.25", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "lKegAyiWytPNEXH0", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json index 40f6d0c685..d0f73f75ef 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MINIIS 0.6", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG @MINIIS 0.6;Prusa Generic PETG MINIIS 0.6", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "7QT1EXl4qKoNBuqz", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json index a578482dc0..353d01603c 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MINIIS 0.8", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG @MINIIS 0.8;Prusa Generic PETG MINIIS 0.8", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "zl2HOUtcoIR2dFQH", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json index 5a135dfd2d..c5df3291e1 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MINIIS", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG @MINIIS;Prusa Generic PETG MINIIS", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "COQ9qpnYRGAFRBoq", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json index e338514096..66cbb86acc 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @MK3.5 0.25;Prusa Generic PETG MK3.5 0.25", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "M0vmzxmP3IVIUTuv", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json index d57e0fdb3f..9ffccc5462 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @MK3.5 0.6;Prusa Generic PETG MK3.5 0.6", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "OvkhxGhjjRMjwb4C", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json index 59e45d94f6..1b83f6983e 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @MK3.5 0.8;Prusa Generic PETG MK3.5 0.8", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "kZSlkCTdghAi8LFG", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json index 7d63599c7a..4d868e63e0 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK3.5", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @MK3.5;Prusa Generic PETG MK3.5", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "6PUbXHNUBfWjVvse", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json index 68f627daa4..167303226a 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG @MK4;Prusa Generic PETG MK4", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "ieo6hcpwnV0j76eo", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json index ddfbb665be..f755d3343c 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S 0.6", - "inherits": "Generic PETG @Prusa MK4S", "renamed_from": "Prusa Generic PETG @MK4S 0.6;Prusa Generic PETG MK4S 0.6", + "inherits": "Generic PETG @Prusa MK4S", "from": "system", "setting_id": "z5Ys1AU5ujQF9D5U", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json index 8e8fee1973..77aabc46a0 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S 0.8", - "inherits": "Generic PETG @Prusa MK4S", "renamed_from": "Prusa Generic PETG @MK4S 0.8;Prusa Generic PETG MK4S 0.8", + "inherits": "Generic PETG @Prusa MK4S", "from": "system", "setting_id": "LKUzA7cbyYL6kxar", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json index ebbdb73717..ef4945eb07 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S HF0.4", - "inherits": "Generic PETG @Prusa MK4S", "renamed_from": "Prusa Generic PETG @MK4S HF0.4;Prusa Generic PETG MK4S HF0.4", + "inherits": "Generic PETG @Prusa MK4S", "from": "system", "setting_id": "lLapCyweW6Svj7cV", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json index e424f13c82..ba6a2d5373 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S HF0.5", - "inherits": "Generic PETG @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PETG @MK4S HF0.5;Prusa Generic PETG MK4S HF0.5", + "inherits": "Generic PETG @Prusa MK4S HF0.4", "from": "system", "setting_id": "lu9twhsjDkBT1kyn", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json index c0d46b3ca1..2835358872 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S HF0.6", - "inherits": "Generic PETG @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PETG @MK4S HF0.6;Prusa Generic PETG MK4S HF0.6", + "inherits": "Generic PETG @Prusa MK4S HF0.4", "from": "system", "setting_id": "d7ocKzA4YSAit63Z", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json index 237c3f116a..cb2834ee4b 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S HF0.8", - "inherits": "Generic PETG @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PETG @MK4S HF0.8;Prusa Generic PETG MK4S HF0.8", + "inherits": "Generic PETG @Prusa MK4S HF0.4", "from": "system", "setting_id": "HSBSswxwznxDClK5", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json index b7bbc6094e..8126c317cd 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa MK4S", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG @MK4S;Prusa Generic PETG MK4S", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "t3ZCKWVct5d69cb8", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json index 6881507204..dd9029f4c4 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Prusa", - "inherits": "Generic PETG @Prusa base", "renamed_from": "Prusa Generic PETG", + "inherits": "Generic PETG @Prusa base", "from": "system", "setting_id": "Vwc0owmwoEYrLhuU", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json index e8de400490..24584986f2 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MINIIS 0.6", - "inherits": "Generic PETG HF @Prusa base", "renamed_from": "Prusa Generic PETG HF @MINIIS 0.6;Prusa Generic PETG HF MINIIS 0.6", + "inherits": "Generic PETG HF @Prusa base", "from": "system", "setting_id": "nF8YzRMvaT4D8LBD", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json index adc5401268..5a50d4e42c 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MINIIS 0.8", - "inherits": "Generic PETG HF @Prusa base", "renamed_from": "Prusa Generic PETG HF @MINIIS 0.8;Prusa Generic PETG HF MINIIS 0.8", + "inherits": "Generic PETG HF @Prusa base", "from": "system", "setting_id": "7itUjrAu9Oj9hxiU", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json index 9148f5e849..1c2f083063 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MINIIS", - "inherits": "Generic PETG HF @Prusa base", "renamed_from": "Prusa Generic PETG HF @MINIIS;Prusa Generic PETG HF MINIIS", + "inherits": "Generic PETG HF @Prusa base", "from": "system", "setting_id": "dPNOryBcrviemefo", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json index 71481537b1..c799624fcf 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG HF @MK3.5 0.6;Prusa Generic PETG HF MK3.5 0.6", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YqVidH7m1HXR3hHZ", "filament_id": "OF7lOgYF", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json index 5dffe82d0b..e5811d0eb7 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG HF @MK3.5 0.8;Prusa Generic PETG HF MK3.5 0.8", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "vfR067tK5WsrE4pw", "filament_id": "OF7lOgYF", diff --git a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json index e343519efd..c5bcb47158 100644 --- a/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG HF @Prusa MK3.5", - "inherits": "fdm_filament_pet", "renamed_from": "Prusa Generic PETG HF @MK3.5;Prusa Generic PETG HF MK3.5", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "grvZIUU79fxDOa3O", "filament_id": "OF7lOgYF", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json index 2e2f9275d4..009a827c7f 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One 0.6", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One 0.6;Prusa Generic PLA CORE One 0.6", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "IkmLxDwrdRkacHWw", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json index cfe88119de..18a60b5cc1 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One 0.8", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One 0.8;Prusa Generic PLA CORE One 0.8", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "aBengWdqRXg9i2sx", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json index c0969904c7..e821c4d97d 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One HF 0.4", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One HF 0.4;Prusa Generic PLA CORE One HF 0.4", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "vniEPaoyABoAfLFa", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json index 5d6e9fcba2..af02d26924 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One HF 0.5", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One HF 0.5;Prusa Generic PLA CORE One HF 0.5", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "NPEs4gtBlKWupYZX", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json index 6575aebf8d..dd830e04cd 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One HF 0.6", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One HF 0.6;Prusa Generic PLA CORE One HF 0.6", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "SnfULjrWGCiA7ljq", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json index 64471ba72b..45efb6df87 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One HF 0.8", - "inherits": "Generic PLA @Prusa CORE One", "renamed_from": "Prusa Generic PLA @CORE One HF 0.8;Prusa Generic PLA CORE One HF 0.8", + "inherits": "Generic PLA @Prusa CORE One", "from": "system", "setting_id": "ZsIuxJUaBzoeWPDv", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json index 9bc9e086b0..d16a6c0366 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa CORE One", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @CORE One;Prusa Generic PLA CORE One", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "r2i4c7DsYXYIMVCX", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json index 3682a6fcb0..1ac72b15e4 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MINIIS 0.25", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA @MINIIS 0.25;Prusa Generic PLA MINIIS 0.25", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "t7jm6WSfRqsdSZfz", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json index ae982f46bc..2701d684c6 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MINIIS 0.6", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA @MINIIS 0.6;Prusa Generic PLA MINIIS 0.6", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "hWk01xYl6gu41B4w", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json index 8a5897d741..77defbf7c1 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MINIIS 0.8", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA @MINIIS 0.8;Prusa Generic PLA MINIIS 0.8", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "6A9NivZl5nMpNfsz", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json index cf2adda390..1a3429b6a7 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MINIIS", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA @MINIIS;Prusa Generic PLA MINIIS", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "3bPlO5U5udlu8eVv", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json index b3f84dc4e1..3e831471cf 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @MK3.5 0.25;Prusa Generic PLA MK3.5 0.25", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "IJsZsvdG7N8uwobX", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json index 49d75d5e31..d75f11c181 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @MK3.5 0.6;Prusa Generic PLA MK3.5 0.6", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "YLx95teMRy5UQWKN", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json index 6590e43c17..0cadf43880 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @MK3.5 0.8;Prusa Generic PLA MK3.5 0.8", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "bZ42VSqIaJlri1VH", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json index 058e05e99e..75bd9f92d2 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK3.5", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @MK3.5;Prusa Generic PLA MK3.5", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "5tDjTVPzE0lIEReK", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json index e7cc5df0d8..548980044c 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA @MK4;Prusa Generic PLA MK4", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "cBqjSJcxcXvS8sY0", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json index bcc0847385..ab91482338 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S 0.6", - "inherits": "Generic PLA @Prusa MK4S", "renamed_from": "Prusa Generic PLA @MK4S 0.6;Prusa Generic PLA MK4S 0.6", + "inherits": "Generic PLA @Prusa MK4S", "from": "system", "setting_id": "vLeTzdoXExkeNSdX", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json index e574ce49a5..92ae855bfe 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S 0.8", - "inherits": "Generic PLA @Prusa MK4S", "renamed_from": "Prusa Generic PLA @MK4S 0.8;Prusa Generic PLA MK4S 0.8", + "inherits": "Generic PLA @Prusa MK4S", "from": "system", "setting_id": "6fyFsevbPLYfgZRb", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json index 10e37500a8..6ba97466d4 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S HF0.4", - "inherits": "Generic PLA @Prusa MK4S", "renamed_from": "Prusa Generic PLA @MK4S HF0.4;Prusa Generic PLA MK4S HF0.4", + "inherits": "Generic PLA @Prusa MK4S", "from": "system", "setting_id": "BFvt90DhCobphEF9", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json index ec1efb5aad..9c227baa46 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S HF0.5", - "inherits": "Generic PLA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PLA @MK4S HF0.5;Prusa Generic PLA MK4S HF0.5", + "inherits": "Generic PLA @Prusa MK4S HF0.4", "from": "system", "setting_id": "IDv2UUR8EH7AVUIA", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json index 8ce85314dd..5f9bbba153 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S HF0.6", - "inherits": "Generic PLA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PLA @MK4S HF0.6;Prusa Generic PLA MK4S HF0.6", + "inherits": "Generic PLA @Prusa MK4S HF0.4", "from": "system", "setting_id": "t7cAPFNPWmeHBeuD", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json index 968bf56356..383c210e4f 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S HF0.8", - "inherits": "Generic PLA @Prusa MK4S HF0.4", "renamed_from": "Prusa Generic PLA @MK4S HF0.8;Prusa Generic PLA MK4S HF0.8", + "inherits": "Generic PLA @Prusa MK4S HF0.4", "from": "system", "setting_id": "t1a58q4l6Xo6kKCC", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json index a847cf8334..be71cb6113 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa MK4S", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA @MK4S;Prusa Generic PLA MK4S", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lsjHMlvwZzImWgek", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json index 83951fb4ab..5e262da446 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Prusa", - "inherits": "Generic PLA @Prusa base", "renamed_from": "Prusa Generic PLA", + "inherits": "Generic PLA @Prusa base", "from": "system", "setting_id": "SBviEhhXcdsIwj0y", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json index 56c2e823b0..9459c8734a 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MINIIS 0.6", - "inherits": "Generic PLA HF @Prusa base", "renamed_from": "Prusa Generic PLA HF @MINIIS 0.6;Prusa Generic PLA HF MINIIS 0.6", + "inherits": "Generic PLA HF @Prusa base", "from": "system", "setting_id": "eqBN6ykUB4csEMCR", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json index be0722c134..232e4b6638 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MINIIS 0.8", - "inherits": "Generic PLA HF @Prusa base", "renamed_from": "Prusa Generic PLA HF @MINIIS 0.8;Prusa Generic PLA HF MINIIS 0.8", + "inherits": "Generic PLA HF @Prusa base", "from": "system", "setting_id": "FuCHQFBuP9yLUzT0", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json index 656c756e6d..c59708df52 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MINIIS", - "inherits": "Generic PLA HF @Prusa base", "renamed_from": "Prusa Generic PLA HF @MINIIS;Prusa Generic PLA HF MINIIS", + "inherits": "Generic PLA HF @Prusa base", "from": "system", "setting_id": "cQJUt7LR5hkKT0Za", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json index 41dce0b5ed..e738c7104e 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA HF @MK3.5 0.6;Prusa Generic PLA HF MK3.5 0.6", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "5vgrugarZSgMZ6FT", "filament_id": "OFZr862X", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json index b6af02d8fb..90ce533d55 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA HF @MK3.5 0.8;Prusa Generic PLA HF MK3.5 0.8", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CM3EYkpRcWwsw7KB", "filament_id": "OFZr862X", diff --git a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json index 46ed4d0752..a4a7e5a583 100644 --- a/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA HF @Prusa MK3.5", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA HF @MK3.5;Prusa Generic PLA HF MK3.5", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4N82rUxi9Bbm2Cdd", "filament_id": "OFZr862X", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json index aeeba4d5ee..7772677dad 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa CORE One 0.6", - "inherits": "Generic PLA Silk @Prusa CORE One", "renamed_from": "Prusa Generic PLA Silk @CORE One 0.6;Prusa Generic PLA Silk CORE One 0.6", + "inherits": "Generic PLA Silk @Prusa CORE One", "from": "system", "setting_id": "nBWqKjSKw2UEAmkv", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json index 82e3840d37..8eddb354ab 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa CORE One 0.8", - "inherits": "Generic PLA Silk @Prusa CORE One", "renamed_from": "Prusa Generic PLA Silk @CORE One 0.8;Prusa Generic PLA Silk CORE One 0.8", + "inherits": "Generic PLA Silk @Prusa CORE One", "from": "system", "setting_id": "a2KWbhOMQrFTkAZh", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json index c11965fc72..ba4c693334 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa CORE One", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA Silk @CORE One;Prusa Generic PLA Silk CORE One", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "F9lNHyhZwZi7aD74", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json index 82413605dc..29df44572b 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa MK4S 0.6", - "inherits": "Generic PLA Silk @Prusa MK4S", "renamed_from": "Prusa Generic PLA Silk @MK4S 0.6;Prusa Generic PLA Silk MK4S 0.6", + "inherits": "Generic PLA Silk @Prusa MK4S", "from": "system", "setting_id": "lWYrhnu1MUizrdOB", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json index e94cbdf57a..1342eb8ce2 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa MK4S 0.8", - "inherits": "Generic PLA Silk @Prusa MK4S", "renamed_from": "Prusa Generic PLA Silk @MK4S 0.8;Prusa Generic PLA Silk MK4S 0.8", + "inherits": "Generic PLA Silk @Prusa MK4S", "from": "system", "setting_id": "cyBdMwJ5sAZcQ7wP", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json index 9a3830fd4a..6f3149cb30 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Prusa MK4S", - "inherits": "Generic PLA @Prusa MK4S", "renamed_from": "Prusa Generic PLA Silk @MK4S;Prusa Generic PLA Silk MK4S", + "inherits": "Generic PLA @Prusa MK4S", "from": "system", "setting_id": "9VQ1YVv9EZexIUoF", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json index 9432c36087..201fc6558b 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MINIIS 0.25", - "inherits": "Generic PLA-CF @Prusa base", "renamed_from": "Prusa Generic PLA-CF @MINIIS 0.25;Prusa Generic PLA-CF MINIIS 0.25", + "inherits": "Generic PLA-CF @Prusa base", "from": "system", "setting_id": "uQJghHEl91slhmEP", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json index 7900e25ab2..97708e2263 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MINIIS 0.6", - "inherits": "Generic PLA-CF @Prusa base", "renamed_from": "Prusa Generic PLA-CF @MINIIS 0.6;Prusa Generic PLA-CF MINIIS 0.6", + "inherits": "Generic PLA-CF @Prusa base", "from": "system", "setting_id": "nZEIrx6XaOFsNyHS", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json index 97db4345c8..df0fd97bb1 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MINIIS 0.8", - "inherits": "Generic PLA-CF @Prusa base", "renamed_from": "Prusa Generic PLA-CF @MINIIS 0.8;Prusa Generic PLA-CF MINIIS 0.8", + "inherits": "Generic PLA-CF @Prusa base", "from": "system", "setting_id": "A3VUqeRysd3c5Txq", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json index 4c08a4b23c..532dc5f299 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MINIIS", - "inherits": "Generic PLA-CF @Prusa base", "renamed_from": "Prusa Generic PLA-CF @MINIIS;Prusa Generic PLA-CF MINIIS", + "inherits": "Generic PLA-CF @Prusa base", "from": "system", "setting_id": "cNZereL1ltFYG5FZ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json index 436bf22209..7174067503 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA-CF @MK3.5 0.25;Prusa Generic PLA-CF MK3.5 0.25", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "eID2rl5MlHlkerrQ", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json index db1973c5c8..f81dea6a16 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA-CF @MK3.5 0.6;Prusa Generic PLA-CF MK3.5 0.6", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "FGXPEP83zLoINOZy", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json index bfcbcf2dbc..9d1d02d6c3 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA-CF @MK3.5 0.8;Prusa Generic PLA-CF MK3.5 0.8", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "TM5JPaNUTlZTiuCe", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json index 677bbc0d27..5bbd23098d 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa MK3.5", - "inherits": "fdm_filament_pla", "renamed_from": "Prusa Generic PLA-CF @MK3.5;Prusa Generic PLA-CF MK3.5", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "3qImFrQCon7iUj4c", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json index c572b9f67c..b57c07f4a2 100644 --- a/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Prusa", - "inherits": "Generic PLA-CF @Prusa base", "renamed_from": "Prusa Generic PLA-CF", + "inherits": "Generic PLA-CF @Prusa base", "from": "system", "setting_id": "LIL5n1PzMoaNoJ84", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json index f74228304a..a0485636b5 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MINIIS 0.25", - "inherits": "Generic PVA @Prusa base", "renamed_from": "Prusa Generic PVA @MINIIS 0.25;Prusa Generic PVA MINIIS 0.25", + "inherits": "Generic PVA @Prusa base", "from": "system", "setting_id": "2TecWVXOXcxW37EN", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json index f25c70a70c..7827888a46 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MINIIS 0.6", - "inherits": "Generic PVA @Prusa base", "renamed_from": "Prusa Generic PVA @MINIIS 0.6;Prusa Generic PVA MINIIS 0.6", + "inherits": "Generic PVA @Prusa base", "from": "system", "setting_id": "3UTClbjiwrQUCXsV", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json index 90c4fc2256..1313511a55 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MINIIS 0.8", - "inherits": "Generic PVA @Prusa base", "renamed_from": "Prusa Generic PVA @MINIIS 0.8;Prusa Generic PVA MINIIS 0.8", + "inherits": "Generic PVA @Prusa base", "from": "system", "setting_id": "RKxewqskgDD2DQTk", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json index 99014f18a3..221a384ebc 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MINIIS", - "inherits": "Generic PVA @Prusa base", "renamed_from": "Prusa Generic PVA @MINIIS;Prusa Generic PVA MINIIS", + "inherits": "Generic PVA @Prusa base", "from": "system", "setting_id": "XfJmxNhCJiWTWB9i", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json index a13990f6c7..28d8b6eff4 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MK3.5 0.25", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA @MK3.5 0.25;Prusa Generic PVA MK3.5 0.25", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "P9y77rdSQsCFcFwr", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json index 8854a19282..8543ffbf2d 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA @MK3.5 0.6;Prusa Generic PVA MK3.5 0.6", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "rvSzvHZL6FIiOQV1", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json index 718845dc9a..d2c6e71ab8 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA @MK3.5 0.8;Prusa Generic PVA MK3.5 0.8", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "E2sA3y3Cyp0UsQD4", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json index 6e1e1c9381..5d895dd35f 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa MK3.5", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA @MK3.5;Prusa Generic PVA MK3.5", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "UTyXSJox9HVdwfXR", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Prusa/filament/Generic PVA @Prusa.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json index 3ad6ba8337..5d11a4e854 100644 --- a/resources/profiles/Prusa/filament/Generic PVA @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Prusa", - "inherits": "Generic PVA @Prusa base", "renamed_from": "Prusa Generic PVA", + "inherits": "Generic PVA @Prusa base", "from": "system", "setting_id": "uVzUlzHkXz6rH1ml", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json index f4e03d791f..b6d9877fe8 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MINIIS 0.6", - "inherits": "Generic PVA HF @Prusa base", "renamed_from": "Prusa Generic PVA HF @MINIIS 0.6;Prusa Generic PVA HF MINIIS 0.6", + "inherits": "Generic PVA HF @Prusa base", "from": "system", "setting_id": "qeWFOMhrKa1yezHw", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json index e8935f9172..55510df02d 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MINIIS 0.8", - "inherits": "Generic PVA HF @Prusa base", "renamed_from": "Prusa Generic PVA HF @MINIIS 0.8;Prusa Generic PVA HF MINIIS 0.8", + "inherits": "Generic PVA HF @Prusa base", "from": "system", "setting_id": "h0RQ3XME0UFEeZVA", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json index a4a131da97..d15d79a5a1 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MINIIS", - "inherits": "Generic PVA HF @Prusa base", "renamed_from": "Prusa Generic PVA HF @MINIIS;Prusa Generic PVA HF MINIIS", + "inherits": "Generic PVA HF @Prusa base", "from": "system", "setting_id": "VZcvmjCAtivpMepD", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json index 1b78b6b0bc..299a2925c0 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MK3.5 0.6", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA HF @MK3.5 0.6;Prusa Generic PVA HF MK3.5 0.6", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "8R3yU9OjRFBIp1nU", "filament_id": "OFDwBwO5", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json index 94f635382e..b7793a0dcf 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MK3.5 0.8", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA HF @MK3.5 0.8;Prusa Generic PVA HF MK3.5 0.8", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "OOUVHHPIB95wqeTB", "filament_id": "OFDwBwO5", diff --git a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json index c3749316e9..9b50e42404 100644 --- a/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA HF @Prusa MK3.5", - "inherits": "fdm_filament_pva", "renamed_from": "Prusa Generic PVA HF @MK3.5;Prusa Generic PVA HF MK3.5", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "gTh9PfBYkibWdknz", "filament_id": "OFDwBwO5", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json index dc68ea318c..018ffeb1b7 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa CORE One 0.6", - "inherits": "Generic TPU @Prusa CORE One", "renamed_from": "Prusa Generic TPU @CORE One 0.6;Prusa Generic TPU CORE One 0.6", + "inherits": "Generic TPU @Prusa CORE One", "from": "system", "setting_id": "VvvSk3OsXXxyerAX", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json index 93b68e0afa..c4d79ea162 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa CORE One 0.8", - "inherits": "Generic TPU @Prusa CORE One", "renamed_from": "Prusa Generic TPU @CORE One 0.8;Prusa Generic TPU CORE One 0.8", + "inherits": "Generic TPU @Prusa CORE One", "from": "system", "setting_id": "LUUEXi6UUk0Zs5Pf", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json index 3717f8586a..ae0a3edf7b 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa CORE One", - "inherits": "fdm_filament_flex", "renamed_from": "Prusa Generic TPU @CORE One;Prusa Generic TPU CORE One", + "inherits": "fdm_filament_flex", "from": "system", "setting_id": "jsXqf9CeaXCvsrWM", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json index 85c60e64a8..f76317163d 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MINIIS", - "inherits": "Generic TPU @Prusa base", "renamed_from": "Prusa Generic TPU @MINIIS;Prusa Generic TPU MINIIS", + "inherits": "Generic TPU @Prusa base", "from": "system", "setting_id": "bOai5Ib1dggl5Qlc", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json index 3e72481ea7..65c6989baf 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MK3.5", - "inherits": "fdm_filament_tpu", "renamed_from": "Prusa Generic TPU @MK3.5;Prusa Generic TPU MK3.5", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "j6bDPJnwtsB16yBu", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json index 52c7ebf182..cc2959bcc5 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MK4", - "inherits": "Generic TPU @Prusa base", "renamed_from": "Prusa Generic TPU @MK4;Prusa Generic TPU MK4", + "inherits": "Generic TPU @Prusa base", "from": "system", "setting_id": "9wL3LAJZ7PyqBVEb", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json index 4b5399bd89..674f3bf3d4 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MK4S 0.6", - "inherits": "Generic TPU @Prusa MK4S", "renamed_from": "Prusa Generic TPU @MK4S 0.6;Prusa Generic TPU MK4S 0.6", + "inherits": "Generic TPU @Prusa MK4S", "from": "system", "setting_id": "XM427EDbbCgt2wNZ", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json index 3a663958f1..a10c0bb03c 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MK4S 0.8", - "inherits": "Generic TPU @Prusa MK4S", "renamed_from": "Prusa Generic TPU @MK4S 0.8;Prusa Generic TPU MK4S 0.8", + "inherits": "Generic TPU @Prusa MK4S", "from": "system", "setting_id": "2UPIZFNertdlZ4o2", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json index 75f1895c87..beeefc6393 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa MK4S", - "inherits": "fdm_filament_tpu", "renamed_from": "Prusa Generic TPU @MK4S;Prusa Generic TPU MK4S", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "wdopbtHBnMKC2rhj", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json index 95048f947c..0e51d2d827 100644 --- a/resources/profiles/Prusa/filament/Generic TPU @Prusa.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Prusa", - "inherits": "Generic TPU @Prusa base", "renamed_from": "Prusa Generic TPU", + "inherits": "Generic TPU @Prusa base", "from": "system", "setting_id": "bmtq13tfalfSTRrO", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json index 4c4ab81b42..dc35f57d09 100644 --- a/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU HF @Prusa MINIIS", - "inherits": "Generic TPU HF @Prusa base", "renamed_from": "Prusa Generic TPU HF @MINIIS;Prusa Generic TPU HF MINIIS", + "inherits": "Generic TPU HF @Prusa base", "from": "system", "setting_id": "Jw1UjgrXtYG5rMDt", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json index f958cac588..cc0c571567 100644 --- a/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU HF @Prusa MK3.5", - "inherits": "fdm_filament_tpu", "renamed_from": "Prusa Generic TPU HF @MK3.5;Prusa Generic TPU HF MK3.5", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "W8pYAV5JMW70PKlw", "filament_id": "OFnT7Qpb", diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json index 18fe72ef3f..9890e6c88e 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json @@ -96,6 +96,7 @@ "0.2" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "fan_speedup_time": "0.2", diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json index ae7df2e583..0c7c1de00f 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json @@ -96,6 +96,7 @@ "0.2" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "fan_speedup_time": "0.2", diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 4ccb243fe3..4b6496df31 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.15", + "version": "02.04.00.16", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json index 2ca51212e7..b9a712df46 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle;Qidi Generic ABS Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "IQDYfIQsv6WlnA3z", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json index 7c22168a8e..9f67b4ed0c 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle;Qidi Generic ABS Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "YS0ov4dEWAJhRRvk", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json index b16d7783b2..ed830abf62 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle;Qidi Generic ABS Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "LQTfTgV2MBEm6DDD", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json index 61f33e870a..fcc954bd1d 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle;Qidi Generic ABS Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "ZWOlrWQQwvsDV8xa", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json index fcb9b9f547..5b8101c544 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Max 3 0.2 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle;Qidi Generic ABS Qidi X-Max 3 0.2 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "v7w2dLJ1MtUjvy1l", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json index c52716ea4b..7d82df3dfe 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle;Qidi Generic ABS Qidi X-Plus 3 0.2 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "vH2jlch11zfDBUPP", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json index 521521c0fe..d6608ea9c7 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle;Qidi Generic ABS Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "0bwmAx9OQYm5MwVE", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json index b5bbbdbf47..ce1d6d1031 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle;Qidi Generic ABS Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "Y3yAythmKXxr76Pg", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json index 27ef9809e8..2d220fae24 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle;Qidi Generic ABS Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "Bt8ySpZn6WFWC00A", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json index 3dcc3d5889..5f70d001c9 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle;Qidi Generic ABS Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "7j3bweJutseUaoZQ", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json index 7503ba737d..abb68163d7 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Generic ABS @Qidi", "renamed_from": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle;Qidi Generic ABS Qidi X-Smart 3 0.2 nozzle", + "inherits": "Generic ABS @Qidi", "from": "system", "setting_id": "StJpaMQKORYm7i94", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json index 76a01a3fa6..94bff391e1 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Qidi", - "inherits": "fdm_filament_abs", "renamed_from": "Qidi Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "iO5utPsBKAo7cHop", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index 749dddc689..131ed3d9bc 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle;Qidi Generic ASA Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "3LUibDTlv799Gy6r", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index f8ef61a4aa..40aa8e0cce 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle;Qidi Generic ASA Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "EtjXhHzpmShNgIqj", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index cef5172ed5..042d20b807 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle;Qidi Generic ASA Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "5hlUjx0YAFTR9TYr", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index 93b389d444..beaa056c27 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle;Qidi Generic ASA Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "oArSgOFOlXLGkueW", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json index 38b0088adb..61b4f99d0b 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Max 3 0.2 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle;Qidi Generic ASA Qidi X-Max 3 0.2 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "LfT1OaNir4KZevUP", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json index c0e92e8f7c..e324f211d0 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle;Qidi Generic ASA Qidi X-Plus 3 0.2 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "S2aFIcoyiIsZ5TR8", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json index 1f7ec6918c..8a7eef5c24 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle;Qidi Generic ASA Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "aYowi3jA3nUcr5e8", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json index 1a42a6d075..2c40f2f68c 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle;Qidi Generic ASA Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "Qaogxqa5Zw7i7n0a", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json index 6700a02c94..9f071cebf6 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle;Qidi Generic ASA Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "aP2WrJLkjpGFtt8I", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json index 3a1c923505..a7f079c5b9 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle;Qidi Generic ASA Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "mx6C1Q73i0B7gpag", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json index 437ed6c7d8..45110363c3 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Generic ASA @Qidi", "renamed_from": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle;Qidi Generic ASA Qidi X-Smart 3 0.2 nozzle", + "inherits": "Generic ASA @Qidi", "from": "system", "setting_id": "6jbwOYmS2ypqTshH", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json index 6057fbea4a..0e3f924506 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Qidi", - "inherits": "fdm_filament_asa", "renamed_from": "Qidi Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "IO7E03K3t2sySCAM", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Qidi/filament/Generic PA @Qidi.json b/resources/profiles/Qidi/filament/Generic PA @Qidi.json index c27771e405..6f56a24db4 100644 --- a/resources/profiles/Qidi/filament/Generic PA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PA @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Qidi", - "inherits": "fdm_filament_pa", "renamed_from": "Qidi Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "la9e4F5ns9eWv7Lg", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json index bdf39e1630..fa2710c578 100644 --- a/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Qidi", - "inherits": "fdm_filament_pa", "renamed_from": "Qidi Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "qLuGt33iENH6QTjv", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json index 8573598189..ee2ff50daf 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi 0.2 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @0.2 nozzle;Qidi Generic PC 0.2 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "Ei2Izb38mh4A4wgw", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json index 491f5917d3..ff71dffad4 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi 0.8 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @0.8 nozzle;Qidi Generic PC 0.8 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "marM5nqtpl08NP9b", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json index fb85345598..ad21c9206a 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PC Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "5sAcMTaVI41PCs3n", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json index b7057b6c2f..d635aa6da6 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PC Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "QmaeYzkbcmKJCJSv", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json index 56a5a8e132..e774dac351 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PC Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "heIlhCMIZ9MXeDHE", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json index 13f13ea759..f9f3fa7cef 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PC Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "JlztE3hk1LB23o4h", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json index 29c7c1658b..b1ff25edbd 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle;Qidi Generic PC Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "2eI2cXfCN6vlk6UV", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json index ba52effd22..c8427080e2 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PC Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "kGhUT0TAXku3by9D", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json index e3f9c180ba..78afa33a2e 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle;Qidi Generic PC Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "HzAwEYvedOi3GRMY", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json index e6c8d1586d..c85b2b7230 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic PC @Qidi", "renamed_from": "Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle;Qidi Generic PC Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic PC @Qidi", "from": "system", "setting_id": "iq1u1nPMi9GT31p9", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi.json b/resources/profiles/Qidi/filament/Generic PC @Qidi.json index c69f050f5c..574c75e189 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Qidi", - "inherits": "fdm_filament_pc", "renamed_from": "Qidi Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "m1fBauBqqvKdIAAr", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json index 02004cab28..a2ea56a059 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PETG Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "D2QwO7VczuscejBF", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index 10a2b2f080..b8e5e3ed9f 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PETG Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "GeV4szn47hD1UedT", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json index 995b79eb68..c739178dfd 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PETG Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "hwVzOmBJL0wnhzVj", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json index f1d1298d8d..ebc69da5df 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PETG Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "QKyHd7rHutldls1y", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json index 9eb15c7a9c..c4728dd56b 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Max 3 0.2 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle;Qidi Generic PETG Qidi X-Max 3 0.2 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "afJiGzHpK1vEgb0S", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json index 7994ab710f..fcce9fc73a 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle;Qidi Generic PETG Qidi X-Plus 3 0.2 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "grlFOKGDoAo075zz", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json index f8de246245..e545d2e6f5 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle;Qidi Generic PETG Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "hb1v0ytZ8KFm0KeO", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json index 0419f9669d..7d13f3211b 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PETG Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "V8YvTFXnlItPw97m", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json index f4a3448c63..40fcfa53e8 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle;Qidi Generic PETG Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "X9FiUfQBLABTKIKO", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json index 6bc15f85a2..2381fdb58c 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle;Qidi Generic PETG Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "5XdW6h65aMPX61o9", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json index ac5c820791..c08df1141a 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Generic PETG @Qidi", "renamed_from": "Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle;Qidi Generic PETG Qidi X-Smart 3 0.2 nozzle", + "inherits": "Generic PETG @Qidi", "from": "system", "setting_id": "MynfKhfKlXwFaVOJ", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json index b4747dc9df..94b2ec8002 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Qidi", - "inherits": "fdm_filament_pet", "renamed_from": "Qidi Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "zRfo4sbJ3auEJtiC", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json index fbe5386405..d99e3af12b 100644 --- a/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Qidi", - "inherits": "fdm_filament_pet", "renamed_from": "Qidi Generic PETG-CF", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "1ehKRzcekplfoFdJ", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json index 4c0c00e6ba..86c04e8e84 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PLA Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "2TNFziuyxg2X4zgY", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index 5b49e8560e..b8f25d0170 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "PNCPMC8uMY9h5SZr", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json index 442f46e559..ef0c9e0b58 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PLA Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "23t94qXoDPSdi7fS", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json index d915ed03a8..04e92b79fd 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PLA Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "aWIicFWyadhnYKfF", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json index 52ee24c470..619675bfa9 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Max 3 0.2 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle;Qidi Generic PLA Qidi X-Max 3 0.2 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "VhP4JYzAah2X1Kr3", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json index 76521556dd..7da0c07712 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Max 3 0.6 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle;Qidi Generic PLA Qidi X-Max 3 0.6 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "uhzFvazl2rWd0YN3", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json index 4246b7fc19..3a054b001a 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Max 3 0.8 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle;Qidi Generic PLA Qidi X-Max 3 0.8 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "t7bkbAgWCK7ObiK4", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json index 7508b21dc3..c2c3235b9d 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle;Qidi Generic PLA Qidi X-Plus 3 0.2 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "1iUDRQmhNsb4Tlag", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json index fcdcb48de7..ecad4ab984 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 3 0.6 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle;Qidi Generic PLA Qidi X-Plus 3 0.6 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "qbT3T9cRjqK7aO4M", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json index d42c838771..9fea437ebe 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 3 0.8 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle;Qidi Generic PLA Qidi X-Plus 3 0.8 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "dMVLTDJInWMo2fMP", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json index 8124fb26b0..8aeb08e0d0 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle;Qidi Generic PLA Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "4OyCs9habQtGhoot", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json index 90d822953f..60aef44069 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PLA Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "SU5XqpfPO5g87dfL", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json index 2cc9b574c1..77199ca160 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle;Qidi Generic PLA Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "7ALKguzkoK6KLHVv", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json index 2f0ab0b4c7..3b54f66229 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle;Qidi Generic PLA Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "jzfMNZP4WaNcNixD", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json index c9af562ff6..0947ec5a64 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle;Qidi Generic PLA Qidi X-Smart 3 0.2 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "gNbvzCkxedrQ7nQe", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json index 497283dd4c..b4c5017daf 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Smart 3 0.6 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle;Qidi Generic PLA Qidi X-Smart 3 0.6 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "t8uPl9peXZRJbdLj", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json index 6b125ee3aa..1139e581ec 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi X-Smart 3 0.8 nozzle", - "inherits": "Generic PLA @Qidi", "renamed_from": "Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle;Qidi Generic PLA Qidi X-Smart 3 0.8 nozzle", + "inherits": "Generic PLA @Qidi", "from": "system", "setting_id": "VsoBEmU35N8eW3CO", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json index e3e1f6eb48..c49b7ada5c 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Qidi", - "inherits": "fdm_filament_pla", "renamed_from": "Qidi Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "illxClFj0LphvnHh", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json index 75f9a19364..75bb815bb9 100644 --- a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic PLA @Qidi X-Plus 4 0.2 nozzle", "renamed_from": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle;Qidi Generic PLA High Speed Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic PLA @Qidi X-Plus 4 0.2 nozzle", "from": "system", "setting_id": "ktWvoEzkA0mJ0Q5T", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json index 7067954ef5..ff45958f89 100644 --- a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PLA @Qidi X-Plus 4 0.4 nozzle", "renamed_from": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PLA High Speed Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PLA @Qidi X-Plus 4 0.4 nozzle", "from": "system", "setting_id": "lBa0yfqPsQgr4U3m", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json index d4bd50b020..aea3f32b82 100644 --- a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic PLA @Qidi X-Plus 4 0.6 nozzle", "renamed_from": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle;Qidi Generic PLA High Speed Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic PLA @Qidi X-Plus 4 0.6 nozzle", "from": "system", "setting_id": "Ls5CQx5Yf8QuC4T3", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json index dd77278778..e290cff0c9 100644 --- a/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic PLA @Qidi X-Plus 4 0.8 nozzle", "renamed_from": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle;Qidi Generic PLA High Speed Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic PLA @Qidi X-Plus 4 0.8 nozzle", "from": "system", "setting_id": "VyCsuptxJnVw1KqD", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json index fbf48ad575..365da21bae 100644 --- a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic PLA Silk @Qidi", "renamed_from": "Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA Silk Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic PLA Silk @Qidi", "from": "system", "setting_id": "VusYzaMdLpjravVc", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json index bbfd984880..76fa98a2b6 100644 --- a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PLA Silk @Qidi", "renamed_from": "Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PLA Silk Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PLA Silk @Qidi", "from": "system", "setting_id": "9GVORPqwLq0s3mlY", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json index c9fed29f60..d2ebb83e3e 100644 --- a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Qidi", - "inherits": "fdm_filament_pla", "renamed_from": "Qidi Generic PLA Silk", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qmNmFB6yN23u389x", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json index e61e507c68..755924040f 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PLA+ Qidi Q1 Pro 0.2 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "S5IihmYwqdoEXiOT", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json index 842010a166..4a5ceebc40 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA+ Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "iZYrNv7L15yrfAPR", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json index 1b48ab6b10..09eb399d77 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PLA+ Qidi Q1 Pro 0.6 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "zDYfWdaJGDL64gzD", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json index 677620b7b7..7d90ab5d6a 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PLA+ Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "eAtbANg8BCzaurOY", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json index f3fa9ec4b4..ef4ddb5536 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Max 3 0.2 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle;Qidi Generic PLA+ Qidi X-Max 3 0.2 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "ak1iDHwta1iV5CXw", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json index 2e151c9e14..5041834b25 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Max 3 0.6 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle;Qidi Generic PLA+ Qidi X-Max 3 0.6 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "JwpYPwMfRZtymarF", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json index b829c40c1a..c236f16d65 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Max 3 0.8 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle;Qidi Generic PLA+ Qidi X-Max 3 0.8 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "ZOuRUZf07g43ZV9u", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json index 2a761a1946..94d972de5f 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle;Qidi Generic PLA+ Qidi X-Plus 3 0.2 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "DujfIhzIsPDdHZlg", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json index 657b16a6a4..9a38c47abf 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle;Qidi Generic PLA+ Qidi X-Plus 3 0.6 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "BA46FjbkAt4dhdfQ", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json index 9455380809..f861a4a8b3 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle;Qidi Generic PLA+ Qidi X-Plus 3 0.8 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "TEqTy5MhYC1CLkrr", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json index ecfb501bb0..7a20b6c326 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle;Qidi Generic PLA+ Qidi X-Plus 4 0.2 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "TO1cgOHqLFnimX9m", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json index c0ff54ee65..7368ff43ef 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle;Qidi Generic PLA+ Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "Dyf2Y7pDd4UWIIJ5", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json index 5ddca086f7..b3271efaeb 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle;Qidi Generic PLA+ Qidi X-Plus 4 0.6 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "ty1M4Mik83FlDWKj", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json index 937e85aff4..1b9f32fb89 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle;Qidi Generic PLA+ Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "Wyo0NeD4dPzA365C", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json index a32c884550..2b35f41efa 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle;Qidi Generic PLA+ Qidi X-Smart 3 0.2 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "lypNmywVe3qfhs2q", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json index fe84ef4f8c..d7013cfd45 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle;Qidi Generic PLA+ Qidi X-Smart 3 0.6 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "Hxpe6y8Xo37WmcQr", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json index 59a6efb166..e37624442b 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", - "inherits": "Generic PLA+ @Qidi", "renamed_from": "Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle;Qidi Generic PLA+ Qidi X-Smart 3 0.8 nozzle", + "inherits": "Generic PLA+ @Qidi", "from": "system", "setting_id": "2jjI8l22cAXTuxMl", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json index 2c1e136f6b..c102baea70 100644 --- a/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA+ @Qidi", - "inherits": "fdm_filament_pla", "renamed_from": "Qidi Generic PLA+", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JhZ9hP9n1gBNGwBq", "filament_id": "OFEWYR89", diff --git a/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json index 1381442943..e3981e0cca 100644 --- a/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Qidi", - "inherits": "fdm_filament_pla", "renamed_from": "Qidi Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XspRlBSqR3DsiFBM", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Qidi/filament/Generic PVA @Qidi.json b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json index ffd25855a1..d38624664c 100644 --- a/resources/profiles/Qidi/filament/Generic PVA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Qidi", - "inherits": "fdm_filament_pva", "renamed_from": "Qidi Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "dmGcoGkH9lvmgsJL", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json index 3fab5170d7..57cf52644e 100644 --- a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Generic TPU 95A @Qidi", "renamed_from": "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle;Qidi Generic TPU 95A Qidi Q1 Pro 0.8 nozzle", + "inherits": "Generic TPU 95A @Qidi", "from": "system", "setting_id": "lwRnIxnWLYp1Hww4", "filament_id": "OFjiXpyf", diff --git a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json index 7e964fd0b8..5e7c3dffa0 100644 --- a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Generic TPU 95A @Qidi", "renamed_from": "Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle;Qidi Generic TPU 95A Qidi X-Plus 4 0.8 nozzle", + "inherits": "Generic TPU 95A @Qidi", "from": "system", "setting_id": "BPUUHxYPhHcPIWs9", "filament_id": "OFjiXpyf", diff --git a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json index 2c9602ee2e..330c6fbeee 100644 --- a/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU 95A @Qidi", - "inherits": "fdm_filament_tpu", "renamed_from": "Qidi Generic TPU 95A", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "nXjylLuhXqtlLGEv", "filament_id": "OFjiXpyf", diff --git a/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index 93793f8d8e..6df699563f 100644 --- a/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Generic TPU @Qidi", "renamed_from": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle;Qidi Generic TPU Qidi Q1 Pro 0.4 nozzle", + "inherits": "Generic TPU @Qidi", "from": "system", "setting_id": "ToMKfKFZDCHyEHw9", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Qidi/filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json index f1c8117c47..5e75f2e8c9 100644 --- a/resources/profiles/Qidi/filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Generic TPU @Qidi", "renamed_from": "Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle;Qidi Generic TPU Qidi X-Plus 4 0.4 nozzle", + "inherits": "Generic TPU @Qidi", "from": "system", "setting_id": "AACIHxmLhuNAGo6d", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Qidi/filament/Generic TPU @Qidi.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json index a525b49520..d34a036466 100644 --- a/resources/profiles/Qidi/filament/Generic TPU @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Qidi", - "inherits": "fdm_filament_tpu", "renamed_from": "Qidi Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "0jwJs0mTFs0904VK", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.2 nozzle.json index 32352a70c8..7debd40941 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "v4Of6ePWz1oGVLqU", "name": "Bambu ABS @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "v4Of6ePWz1oGVLqU", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.4 nozzle.json index 8b6bc2ebb6..80a312cc50 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "K3KqxJ3z6lSKoCsQ", "name": "Bambu ABS @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "K3KqxJ3z6lSKoCsQ", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.6 nozzle.json index 3fa0dfca1f..4cce902594 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "D3OOS6ShJDdn4dlU", "name": "Bambu ABS @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "D3OOS6ShJDdn4dlU", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.8 nozzle.json index 833774ecff..a71a5904d9 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "8zWM4mqGjwjy2yJb", "name": "Bambu ABS @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "8zWM4mqGjwjy2yJb", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json index 0e0fdb08b0..ee457bf4e8 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFhuaUQB", "name": "Bambu ABS@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFhuaUQB", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.2 nozzle.json index 67725a5ee4..185809e35c 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ed9ZVS66ll61akjK", "name": "Bambu PETG @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "ed9ZVS66ll61akjK", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.4 nozzle.json index 953359bb36..008572349b 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "mPLqTb7smgIDOZTg", "name": "Bambu PETG @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "mPLqTb7smgIDOZTg", + "instantiation": "true", "pressure_advance": [ "0.056" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.6 nozzle.json index 77014127cd..e34ce6538c 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "A3K4JfwyqUnciD2e", "name": "Bambu PETG @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "A3K4JfwyqUnciD2e", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.8 nozzle.json index 3e95da1618..a8dfcfb925 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "4qjG4MYXmLPJ5Qjm", "name": "Bambu PETG @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "4qjG4MYXmLPJ5Qjm", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json index ef6ea57354..714f89223c 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFLYDngx", "name": "Bambu PETG@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFLYDngx", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.2 nozzle.json index 8cebbd7581..d3bdaf4de5 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "cI5eJwzwoecS97SU", "name": "Bambu PLA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "cI5eJwzwoecS97SU", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.4 nozzle.json index 3e7d24cf85..f8d805f9cf 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "UP5ST3BYA3nWaT5i", "name": "Bambu PLA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "UP5ST3BYA3nWaT5i", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.6 nozzle.json index e3e192d1e8..984e925e9d 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "jSFJn0WmV76aBwPt", "name": "Bambu PLA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "jSFJn0WmV76aBwPt", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.8 nozzle.json index 2390355042..f9f59c8f53 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "MYCn1SS32p63RzX0", "name": "Bambu PLA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Bambu PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "MYCn1SS32p63RzX0", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json index ad90cb8a81..244c43220a 100644 --- a/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF1dpPrW", "name": "Bambu PLA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF1dpPrW", + "instantiation": "false", "filament_adhesiveness_category": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.2 nozzle.json index c12bcc6687..fe7c8c77cb 100644 --- a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "xxRxeoAbiYJcH1P4", "name": "Generic ABS @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "xxRxeoAbiYJcH1P4", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.4 nozzle.json index 7807bc8420..96f99c0806 100644 --- a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "MM6yfNPfpCtbsm2M", "name": "Generic ABS @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "MM6yfNPfpCtbsm2M", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.6 nozzle.json index 6de2b02613..974d4f2294 100644 --- a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "BIiPt2AExUkASm2F", "name": "Generic ABS @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "BIiPt2AExUkASm2F", + "instantiation": "true", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.8 nozzle.json index 6e7bda8441..4db5f22815 100644 --- a/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic ABS @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "VzKqGnik79qlJ1bA", "name": "Generic ABS @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "VzKqGnik79qlJ1bA", + "instantiation": "true", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic ABS @X-Plus 5.json index 79a52578a4..df28065bdb 100644 --- a/resources/profiles/Qidi/filament/X5/Generic ABS @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic ABS @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFY9muEs", "name": "Generic ABS@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFY9muEs", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.2 nozzle.json index da5c50af1a..ad3e9d3128 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ERbh7DQQfK7A623W", "name": "Generic PC @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PC@X-Plus 5-Series", + "from": "system", + "setting_id": "ERbh7DQQfK7A623W", + "instantiation": "true", "filament_flow_ratio": [ "0.94" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.4 nozzle.json index 487d8dd31d..ede9e25962 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "MK8OyxUEziAeEbXk", "name": "Generic PC @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PC@X-Plus 5-Series", + "from": "system", + "setting_id": "MK8OyxUEziAeEbXk", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.6 nozzle.json index 90829d6463..a7aa10707f 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "EQIfBmyVNumOKVWU", "name": "Generic PC @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PC@X-Plus 5-Series", + "from": "system", + "setting_id": "EQIfBmyVNumOKVWU", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.8 nozzle.json index 514715f8a2..adb328a7f5 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PC @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "FsTuQT5hxmfjHyVZ", "name": "Generic PC @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PC@X-Plus 5-Series", + "from": "system", + "setting_id": "FsTuQT5hxmfjHyVZ", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PC @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PC @X-Plus 5.json index 79745adfce..22a8e9ae48 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PC @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic PC @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFLakOUI", "name": "Generic PC@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFLakOUI", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.2 nozzle.json index 2b4e220a54..ddb382e1b4 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KaxkabCgu6EWZBzj", "name": "Generic PETG @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "KaxkabCgu6EWZBzj", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.4 nozzle.json index 4da60c3c48..d92c9c31e3 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ckqzES7LsTgYKKhb", "name": "Generic PETG @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "ckqzES7LsTgYKKhb", + "instantiation": "true", "pressure_advance": [ "0.056" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.6 nozzle.json index 6f1b9667ab..27071937e8 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "1ID4LaQVZN4WjJ4v", "name": "Generic PETG @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "1ID4LaQVZN4WjJ4v", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.8 nozzle.json index 764e313efe..2948194a2a 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PETG @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "yzkFoRA3R01K3lCa", "name": "Generic PETG @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "yzkFoRA3R01K3lCa", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PETG @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PETG @X-Plus 5.json index 0e65fe68f7..ccbd996499 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PETG @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic PETG @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFYPdQJh", "name": "Generic PETG@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFYPdQJh", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.2 nozzle.json index 218b407d21..704366e9a4 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "m5zUk3OpAayCbBwF", "name": "Generic PLA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "m5zUk3OpAayCbBwF", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.4 nozzle.json index c8dd22aba5..a7d0a7552d 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "5Eorr9nKVhLbnYAZ", "name": "Generic PLA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "5Eorr9nKVhLbnYAZ", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.6 nozzle.json index ee352a5667..bb9627c447 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "nqOawjrkU2lp3P0K", "name": "Generic PLA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "nqOawjrkU2lp3P0K", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.8 nozzle.json index 14a7fa59c1..0c25dc2848 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "nA20S71nTMCso0Bn", "name": "Generic PLA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "nA20S71nTMCso0Bn", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PLA @X-Plus 5.json index 3b7690cc38..2d41995886 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFDSrzZ8", "name": "Generic PLA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFDSrzZ8", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.4 nozzle.json index f701cf5b50..3d298c969a 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "42feLKkUTBQTPNDm", "name": "Generic PLA Silk @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA Silk@X-Plus 5-Series", + "from": "system", + "setting_id": "42feLKkUTBQTPNDm", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.6 nozzle.json index b898df762a..755122bcfd 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "uyCmwBkoRNNRbG5R", "name": "Generic PLA Silk @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA Silk@X-Plus 5-Series", + "from": "system", + "setting_id": "uyCmwBkoRNNRbG5R", + "instantiation": "true", "pressure_advance": [ "0.014" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @X-Plus 5.json index afa64cc602..d4470e4420 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA Silk @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA Silk @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFesA6rF", "name": "Generic PLA Silk@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFesA6rF", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.2 nozzle.json index a7a736a95a..33abeac017 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "aD9SNuHAOxVFczNM", "name": "Generic PLA+ @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA+@X-Plus 5-Series", + "from": "system", + "setting_id": "aD9SNuHAOxVFczNM", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.4 nozzle.json index e10196f45c..2bbaf88d12 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "QDAKF2VaO4MkiYZ7", "name": "Generic PLA+ @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA+@X-Plus 5-Series", + "from": "system", + "setting_id": "QDAKF2VaO4MkiYZ7", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.6 nozzle.json index 62c8ce9de1..faac0f9236 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "kNONALYQIZ8hkU2f", "name": "Generic PLA+ @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA+@X-Plus 5-Series", + "from": "system", + "setting_id": "kNONALYQIZ8hkU2f", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.8 nozzle.json index 78599cb326..cbe051a130 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ehm8mY40hPq6Bjby", "name": "Generic PLA+ @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA+@X-Plus 5-Series", + "from": "system", + "setting_id": "ehm8mY40hPq6Bjby", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json index 72d7b6f9c6..13769cac67 100644 --- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFEWYR89", "name": "Generic PLA+@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFEWYR89", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.4 nozzle.json index 525652742c..db09af9899 100644 --- a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "blCxzXDeplxz7FrS", "name": "Generic TPU 95A @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic TPU 95A@X-Plus 5-Series", + "from": "system", + "setting_id": "blCxzXDeplxz7FrS", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.6 nozzle.json index f17a6e91e5..023195f39f 100644 --- a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "mXwJpelMKlY7SQR8", "name": "Generic TPU 95A @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic TPU 95A@X-Plus 5-Series", + "from": "system", + "setting_id": "mXwJpelMKlY7SQR8", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.8 nozzle.json index 072983e488..482a66f549 100644 --- a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "o9NLhClfpsJFEE3P", "name": "Generic TPU 95A @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Generic TPU 95A@X-Plus 5-Series", + "from": "system", + "setting_id": "o9NLhClfpsJFEE3P", + "instantiation": "true", "nozzle_temperature": [ "220" ], diff --git a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @X-Plus 5.json index b98a3a0a2f..7a9f80d609 100644 --- a/resources/profiles/Qidi/filament/X5/Generic TPU 95A @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Generic TPU 95A @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFjiXpyf", "name": "Generic TPU 95A@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFjiXpyf", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "30" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.2 nozzle.json index 2346539b73..ad98af14f4 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "uarx8NrJerlKsoA8", "name": "HATCHBOX ABS @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "uarx8NrJerlKsoA8", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.4 nozzle.json index 4566ece152..902fe4e144 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "T52l6W0u1uoiXrAx", "name": "HATCHBOX ABS @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "T52l6W0u1uoiXrAx", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.6 nozzle.json index bb16d32b06..ec263bee9b 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "krTIEBmeK9q2R60M", "name": "HATCHBOX ABS @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "krTIEBmeK9q2R60M", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.8 nozzle.json index 19b4ce995f..aefeac6176 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "B99z7PiwClkWtyqv", "name": "HATCHBOX ABS @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "B99z7PiwClkWtyqv", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json index 323fcf3e90..7142ad1de3 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFwLBAGf", "name": "HATCHBOX ABS@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFwLBAGf", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.2 nozzle.json index dc87553374..47ba45ca0c 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "2y03Jbrd8epf06MW", "name": "HATCHBOX PETG @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "2y03Jbrd8epf06MW", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.4 nozzle.json index 21441a8d3e..863b7cc3f2 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KHbEUzPhVICXYhTs", "name": "HATCHBOX PETG @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "KHbEUzPhVICXYhTs", + "instantiation": "true", "pressure_advance": [ "0.056" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.6 nozzle.json index 85219cea79..90413c57b2 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "3HPxSQqEM8XGZqgU", "name": "HATCHBOX PETG @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "3HPxSQqEM8XGZqgU", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.8 nozzle.json index c6b4b699cd..c71cb3a6ec 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "eZnTfUmPGkeoEP87", "name": "HATCHBOX PETG @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PETG@X-Plus 5-Series", + "from": "system", + "setting_id": "eZnTfUmPGkeoEP87", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json index 6f0495c45b..ab0b15a5f7 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFIWMSGX", "name": "HATCHBOX PETG@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFIWMSGX", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.2 nozzle.json index a1838c2041..12ebb48fcf 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Sn0LAKII01kQONZS", "name": "HATCHBOX PLA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "Sn0LAKII01kQONZS", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.4 nozzle.json index 82e54e389e..dc60b97e1d 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "HWmejqWfehK4LG6C", "name": "HATCHBOX PLA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "HWmejqWfehK4LG6C", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.6 nozzle.json index d6ac4c9a7e..0c08bf069f 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "zjIVoA34wN8AT6cp", "name": "HATCHBOX PLA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "zjIVoA34wN8AT6cp", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.8 nozzle.json index 5b89e541e3..e1e42418d9 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "sTjweBRTvE0P6YtE", "name": "HATCHBOX PLA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "HATCHBOX PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "sTjweBRTvE0P6YtE", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json index 7ee05c27f7..056f920c67 100644 --- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFeelsSM", "name": "HATCHBOX PLA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFeelsSM", + "instantiation": "false", "filament_adhesiveness_category": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.2 nozzle.json index 7194b54b7f..e65fd300ae 100644 --- a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "tLj2E2dWAdLKpC4K", "name": "Overture ABS @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "tLj2E2dWAdLKpC4K", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.4 nozzle.json index 5e50aa5dbc..556a0d1708 100644 --- a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "1IkBG0ywAkk3VhOd", "name": "Overture ABS @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "1IkBG0ywAkk3VhOd", + "instantiation": "true", "pressure_advance": [ "0.033" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.6 nozzle.json index 9bacef9d3a..36b67e90b2 100644 --- a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "4SXA27uTG5kcbnAq", "name": "Overture ABS @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "4SXA27uTG5kcbnAq", + "instantiation": "true", "pressure_advance": [ "0.02" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.8 nozzle.json index a53148ed26..fcdf219ca0 100644 --- a/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture ABS @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "AzC8XjbkzsxEPDMG", "name": "Overture ABS @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "AzC8XjbkzsxEPDMG", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json index 82863e8d80..19084c236d 100644 --- a/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFK8XHPn", "name": "Overture ABS@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFK8XHPn", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.2 nozzle.json index f209b21a6e..9cea361938 100644 --- a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "2TAd2Dlk6KPvvmMg", "name": "Overture PLA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "2TAd2Dlk6KPvvmMg", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.4 nozzle.json index a625953f60..a48b32d09a 100644 --- a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "1rKASIobH0DqQUeH", "name": "Overture PLA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "1rKASIobH0DqQUeH", + "instantiation": "true", "pressure_advance": [ "0.037" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.6 nozzle.json index 5a3dfdee8f..7f9e0702d4 100644 --- a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "UWQ7bLf74AxEPDdc", "name": "Overture PLA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "UWQ7bLf74AxEPDdc", + "instantiation": "true", "pressure_advance": [ "0.019" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.8 nozzle.json index 86d8605933..6da685b581 100644 --- a/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Overture PLA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "bIg1NW0EwTlmRNAF", "name": "Overture PLA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Overture PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "bIg1NW0EwTlmRNAF", + "instantiation": "true", "pressure_advance": [ "0.012" ], diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json index 0dbb498feb..3ef4391d22 100644 --- a/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFc3xdm9", "name": "Overture PLA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFc3xdm9", + "instantiation": "false", "filament_adhesiveness_category": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.2 nozzle.json index 0618d3c36f..232efa107a 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "AJYooe7fIzg43McT", "name": "PolyLite ABS @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "AJYooe7fIzg43McT", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.4 nozzle.json index 36e012b0d6..927c0262a1 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "S0uCyMruXw5waEYf", "name": "PolyLite ABS @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "S0uCyMruXw5waEYf", + "instantiation": "true", "pressure_advance": [ "0.033" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.6 nozzle.json index 1bf7cdf030..986b891898 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "oYlfF3MMF5DEeJpK", "name": "PolyLite ABS @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "oYlfF3MMF5DEeJpK", + "instantiation": "true", "pressure_advance": [ "0.02" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.8 nozzle.json index 9d1f541dfc..8167d40eda 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hHXz74Ps9x4T7kZl", "name": "PolyLite ABS @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite ABS@X-Plus 5-Series", + "from": "system", + "setting_id": "hHXz74Ps9x4T7kZl", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json index 1cf57f8ce3..f58163af9f 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFOvv91M", "name": "PolyLite ABS@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFOvv91M", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.2 nozzle.json index f823b38e67..60378002c0 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "kKfybaeH6Llb3Vdc", "name": "PolyLite PLA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "kKfybaeH6Llb3Vdc", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.4 nozzle.json index b7f3ef07f6..41678a9375 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hzEsCxIKwuV2ubrz", "name": "PolyLite PLA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "hzEsCxIKwuV2ubrz", + "instantiation": "true", "pressure_advance": [ "0.037" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.6 nozzle.json index 8b98d3842a..1ad4796c5b 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "PODs7XKIgMiJZI5x", "name": "PolyLite PLA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "PODs7XKIgMiJZI5x", + "instantiation": "true", "pressure_advance": [ "0.019" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.8 nozzle.json index f4b6b8c2ee..7dec540c25 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "LQ1rP7NSTjw2moHk", "name": "PolyLite PLA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "PolyLite PLA@X-Plus 5-Series", + "from": "system", + "setting_id": "LQ1rP7NSTjw2moHk", + "instantiation": "true", "pressure_advance": [ "0.012" ], diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json index 4702c9ba1c..b33091774b 100644 --- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF5CgdDq", "name": "PolyLite PLA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF5CgdDq", + "instantiation": "false", "filament_adhesiveness_category": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.2 nozzle.json index 78389ceeb5..9d31e4b943 100644 --- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "p9cDXBgbjwjOX5me", "name": "Polymaker PLA-HT @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Polymaker PLA-HT@X-Plus 5-Series", + "from": "system", + "setting_id": "p9cDXBgbjwjOX5me", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.4 nozzle.json index 9f77b41119..9088048ab5 100644 --- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "TpI2jqmcVygyTO8N", "name": "Polymaker PLA-HT @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Polymaker PLA-HT@X-Plus 5-Series", + "from": "system", + "setting_id": "TpI2jqmcVygyTO8N", + "instantiation": "true", "pressure_advance": [ "0.037" ], diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.6 nozzle.json index 3c46385369..ba1b143068 100644 --- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "69AgpjCCTxF5ffW1", "name": "Polymaker PLA-HT @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Polymaker PLA-HT@X-Plus 5-Series", + "from": "system", + "setting_id": "69AgpjCCTxF5ffW1", + "instantiation": "true", "pressure_advance": [ "0.019" ], diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.8 nozzle.json index 788db83504..314c12302a 100644 --- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "tcoQNICpWYGdE24e", "name": "Polymaker PLA-HT @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Polymaker PLA-HT@X-Plus 5-Series", + "from": "system", + "setting_id": "tcoQNICpWYGdE24e", + "instantiation": "true", "pressure_advance": [ "0.012" ], diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json index 233542bab1..4cb74f25b5 100644 --- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFfYHK5z", "name": "Polymaker PLA-HT@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFfYHK5z", + "instantiation": "false", "filament_adhesiveness_category": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.2 nozzle.json index 254422bb19..7e2954ea55 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "8SvrXXv743rCyyeN", "name": "QIDI ABS Odorless @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Odorless@X-Plus 5-Series", + "from": "system", + "setting_id": "8SvrXXv743rCyyeN", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.4 nozzle.json index 1bd37ac08a..c1af1b6f1c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "YviPsfkGYv6Q3r3T", "name": "QIDI ABS Odorless @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Odorless@X-Plus 5-Series", + "from": "system", + "setting_id": "YviPsfkGYv6Q3r3T", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.6 nozzle.json index cbb361fb9c..0ec0bd3a8b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "YLOcbaCppSmQ1twv", "name": "QIDI ABS Odorless @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Odorless@X-Plus 5-Series", + "from": "system", + "setting_id": "YLOcbaCppSmQ1twv", + "instantiation": "true", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.8 nozzle.json index 912dc04ed7..a0a88a324e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Klsu6iALsWgbg3vK", "name": "QIDI ABS Odorless @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Odorless@X-Plus 5-Series", + "from": "system", + "setting_id": "Klsu6iALsWgbg3vK", + "instantiation": "true", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @X-Plus 5.json index 7a80b433df..c5b84a18fb 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Odorless @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFma5TXH", "name": "QIDI ABS Odorless@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFma5TXH", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.2 nozzle.json index 99a9e16c08..892be9f985 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "bTwNiMSHwex0gxrd", "name": "QIDI ABS Rapido @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "bTwNiMSHwex0gxrd", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.4 nozzle.json index 30086f5dce..c22b5114cc 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "mcPlHcr33zPv3aIf", "name": "QIDI ABS Rapido @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "mcPlHcr33zPv3aIf", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.6 nozzle.json index 47278a61b1..4ace571ef5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "0np334pRpl3qa8Uq", "name": "QIDI ABS Rapido @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "0np334pRpl3qa8Uq", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.8 nozzle.json index f79fcfdfac..4307b82a73 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Vp2bJxFhsPvW6K0P", "name": "QIDI ABS Rapido @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "Vp2bJxFhsPvW6K0P", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @X-Plus 5.json index 0afffa18f4..5b5626a5f7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFT2jon4", "name": "QIDI ABS Rapido@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFT2jon4", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json index 34632b393f..cba33e6e48 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "U69dFGlkEk9twDF6", "name": "QIDI ABS Rapido Metal @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "U69dFGlkEk9twDF6", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json index 59492201a5..4ccea8f40b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "XaJbATawtVrUsXpz", "name": "QIDI ABS Rapido Metal @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "XaJbATawtVrUsXpz", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json index 93b4cb3aba..cb23a6e9aa 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Xb0A7YqmqP2peSM3", "name": "QIDI ABS Rapido Metal @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "Xb0A7YqmqP2peSM3", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json index c4edce73be..bf577771af 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "4AA9wGDNebbTHf4X", "name": "QIDI ABS Rapido Metal @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "4AA9wGDNebbTHf4X", + "instantiation": "true", "nozzle_temperature": [ "250" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @X-Plus 5.json index 9614cab30f..5e0f760698 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS Rapido Metal @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFeCJqxx", "name": "QIDI ABS Rapido Metal@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFeCJqxx", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.4 nozzle.json index d81d623d33..27c682c04b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "V9h7YWcaTejmFCh0", "name": "QIDI ABS-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "V9h7YWcaTejmFCh0", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.6 nozzle.json index 88ee5f2146..1a0fd60db1 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hO8H1GUCzMkwFtQH", "name": "QIDI ABS-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "hO8H1GUCzMkwFtQH", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.8 nozzle.json index 997e67a0f0..6691f987d0 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "LskHdeEngKlRCSmg", "name": "QIDI ABS-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ABS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "LskHdeEngKlRCSmg", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @X-Plus 5.json index 5336842811..59c26ea74c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ABS-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFt3HtlG", "name": "QIDI ABS-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFt3HtlG", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.2 nozzle.json index d417265f5a..9b5ee8720f 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "FgeIGgT8xZCm4UO8", "name": "QIDI ASA @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA@X-Plus 5-Series", + "from": "system", + "setting_id": "FgeIGgT8xZCm4UO8", + "instantiation": "true", "chamber_temperatures": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.4 nozzle.json index ed86d714a1..e42e13f776 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "VRicNQizOCKkgLBJ", "name": "QIDI ASA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA@X-Plus 5-Series", + "from": "system", + "setting_id": "VRicNQizOCKkgLBJ", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.6 nozzle.json index a7870accce..a071f0b7f0 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KDjln7WdhhbSztX3", "name": "QIDI ASA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA@X-Plus 5-Series", + "from": "system", + "setting_id": "KDjln7WdhhbSztX3", + "instantiation": "true", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.8 nozzle.json index 30496917d1..73ce4a3d38 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "X9TOBuOKBbJIoF7y", "name": "QIDI ASA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA@X-Plus 5-Series", + "from": "system", + "setting_id": "X9TOBuOKBbJIoF7y", + "instantiation": "true", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ASA @X-Plus 5.json index b8fe444dd2..624e97dbd0 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFTsHNQi", "name": "QIDI ASA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFTsHNQi", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @Qidi X-Plus 5 0.4 nozzle.json index 08a4ed22a9..a5979282e9 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "g5F7NP83yx0Iub4c", "name": "QIDI ASA-Aero @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA-Aero@X-Plus 5-Series", + "from": "system", + "setting_id": "g5F7NP83yx0Iub4c", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @X-Plus 5.json index 73fb83834d..2e186ef10c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-Aero @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFu1E4ur", "name": "QIDI ASA-Aero@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFu1E4ur", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.4 nozzle.json index be97fdfd58..295be4eefa 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Aqh00EJ8ZaiPCU6F", "name": "QIDI ASA-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "Aqh00EJ8ZaiPCU6F", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.6 nozzle.json index cd8bbc98bd..98f3269be5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "fgwkL5igRvM0leJf", "name": "QIDI ASA-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "fgwkL5igRvM0leJf", + "instantiation": "true", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.8 nozzle.json index 3095a16138..b4bdf7413b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "bDAcTzwdiXT4fFnT", "name": "QIDI ASA-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI ASA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "bDAcTzwdiXT4fFnT", + "instantiation": "true", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @X-Plus 5.json index 12606c993b..442c6322c8 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI ASA-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF1W7c76", "name": "QIDI ASA-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF1W7c76", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.4 nozzle.json index 165c5cfb62..6bf8f36b07 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "vDXAb7Kkj7nFc8go", "name": "QIDI PA12-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA12-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "vDXAb7Kkj7nFc8go", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.6 nozzle.json index ad26af1f86..29b7b7a0cd 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KjZ3jgo2Zoklkk0F", "name": "QIDI PA12-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA12-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "KjZ3jgo2Zoklkk0F", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.8 nozzle.json index 5324f0c183..e0cf068166 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Xcl3UPe7tmXw9hXa", "name": "QIDI PA12-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA12-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "Xcl3UPe7tmXw9hXa", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @X-Plus 5.json index d4af23e160..fd8437e120 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA12-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFn6WpN7", "name": "QIDI PA12-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFn6WpN7", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.4 nozzle.json index fbe5870078..bb8370b591 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "qTjsP8oR1sbh56Gh", "name": "QIDI PA6-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA6-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "qTjsP8oR1sbh56Gh", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.6 nozzle.json index 016f9bb2e4..255402fa16 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "4kzkdzJmDYGic0aa", "name": "QIDI PA6-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA6-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "4kzkdzJmDYGic0aa", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.8 nozzle.json index ba0d981c29..20b6fdf5c5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "97peVPSildpjdDQj", "name": "QIDI PA6-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PA6-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "97peVPSildpjdDQj", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @X-Plus 5.json index 1c70ef53a0..8ad2e48c7e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PA6-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFZ3K2cL", "name": "QIDI PA6-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFZ3K2cL", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.4 nozzle.json index 68d604414d..11be5e1010 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "3iw5hq0KFa9NU4b3", "name": "QIDI PAHT-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "3iw5hq0KFa9NU4b3", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.6 nozzle.json index 0ca7290e39..22388a4791 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "7eBDjJbetxOC3aNT", "name": "QIDI PAHT-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "7eBDjJbetxOC3aNT", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.8 nozzle.json index b3b88d5f28..99a545da7e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hkIpB0QZOGZpoYFX", "name": "QIDI PAHT-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "hkIpB0QZOGZpoYFX", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @X-Plus 5.json index fec939caa8..db77ecc2ca 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFKgmsqE", "name": "QIDI PAHT-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFKgmsqE", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.4 nozzle.json index 9638d33afc..dc6a820d2c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "R7cctkITobdKgMkY", "name": "QIDI PAHT-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "R7cctkITobdKgMkY", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.6 nozzle.json index 4d926ff370..3d1c6d6d9c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "cVzpHjaSzsDm0bwG", "name": "QIDI PAHT-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "cVzpHjaSzsDm0bwG", + "instantiation": "true", "pressure_advance": [ "0.015" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.8 nozzle.json index ce49e3ef04..e706c99f0e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "N0aUkpcJD6CvODci", "name": "QIDI PAHT-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PAHT-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "N0aUkpcJD6CvODci", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @X-Plus 5.json index de72deb697..b0ad404197 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PAHT-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFo15hcT", "name": "QIDI PAHT-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFo15hcT", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.4 nozzle.json index e4842206ed..331183714a 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "uYwbMiemSo7LxiqR", "name": "QIDI PC/ABS-FR @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PC/ABS-FR@X-Plus 5-Series", + "from": "system", + "setting_id": "uYwbMiemSo7LxiqR", + "instantiation": "true", "pressure_advance": [ "0.042" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.6 nozzle.json index 35c317e8d3..a649c493b5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Fxkv0PN8RU17fkB0", "name": "QIDI PC/ABS-FR @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PC/ABS-FR@X-Plus 5-Series", + "from": "system", + "setting_id": "Fxkv0PN8RU17fkB0", + "instantiation": "true", "pressure_advance": [ "0.031" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.8 nozzle.json index 456a93a6d0..4043236cf7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "oKNGzYqymTnWQsBB", "name": "QIDI PC/ABS-FR @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PC/ABS-FR@X-Plus 5-Series", + "from": "system", + "setting_id": "oKNGzYqymTnWQsBB", + "instantiation": "true", "pressure_advance": [ "0.024" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @X-Plus 5.json index c7e407cd2e..29e56dae89 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PC-ABS-FR @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFDIrhbu", "name": "QIDI PC/ABS-FR@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFDIrhbu", + "instantiation": "false", "box_temperature_range_high": [ "50" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.4 nozzle.json index 5fa07706a9..275b1188b4 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hgdi1oL4EFzh0h7h", "name": "QIDI PEBA 95A @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PEBA 95A@X-Plus 5-Series", + "from": "system", + "setting_id": "hgdi1oL4EFzh0h7h", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.6 nozzle.json index f44261951e..360cea614c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "iNZpBz1iklW3sJlj", "name": "QIDI PEBA 95A @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PEBA 95A@X-Plus 5-Series", + "from": "system", + "setting_id": "iNZpBz1iklW3sJlj", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @X-Plus 5.json index bf56f12203..9de796f2be 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PEBA 95A @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFhiJE7Y", "name": "QIDI PEBA 95A@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFhiJE7Y", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "30" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.4 nozzle.json index bfdd1aed31..f4a91aa343 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "bILtWMlzBPi4Ft8a", "name": "QIDI PET-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "bILtWMlzBPi4Ft8a", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.6 nozzle.json index cb78cf3afc..5716a20bb7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "E0Y6g3qpoERrgSUH", "name": "QIDI PET-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "E0Y6g3qpoERrgSUH", + "instantiation": "true", "pressure_advance": [ "0.025" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.8 nozzle.json index ae40d594ff..c35eddb490 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "e2HuHVJZck2nKANa", "name": "QIDI PET-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "e2HuHVJZck2nKANa", + "instantiation": "true", "pressure_advance": [ "0.025" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @X-Plus 5.json index 9163c3344e..913df35758 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFKfJTwL", "name": "QIDI PET-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFKfJTwL", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.4 nozzle.json index 97029aeb25..7ea2ee2d4f 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "2NHbKFmgDoN1oHlo", "name": "QIDI PET-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "2NHbKFmgDoN1oHlo", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.6 nozzle.json index 480d13bb65..f189d6847e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "cMlzOMKIIIro4H62", "name": "QIDI PET-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "cMlzOMKIIIro4H62", + "instantiation": "true", "pressure_advance": [ "0.014" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.8 nozzle.json index 2cc0cfe2cb..f83d62dfce 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "evxG7nCDQx2Y5UV5", "name": "QIDI PET-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PET-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "evxG7nCDQx2Y5UV5", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @X-Plus 5.json index 83e68f579f..767ab88e1d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PET-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PET-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFhx4uOG", "name": "QIDI PET-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFhx4uOG", + "instantiation": "false", "box_temperature_range_high": [ "50" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.2 nozzle.json index 6689cca71a..ee872fe154 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "k4jOZFY5QV2bMKHK", "name": "QIDI PETG Basic @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "k4jOZFY5QV2bMKHK", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.4 nozzle.json index c1b29f1b75..6fe6c7bb9e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "b55sLpGKCrWLiDPf", "name": "QIDI PETG Basic @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "b55sLpGKCrWLiDPf", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.6 nozzle.json index 3be97a337f..27a8aa59bf 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "XcxbsZ4d8Dh21WX0", "name": "QIDI PETG Basic @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "XcxbsZ4d8Dh21WX0", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.8 nozzle.json index 92a57fb1b8..3c35473c25 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "9MEoOjLU7AOCvb9X", "name": "QIDI PETG Basic @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "9MEoOjLU7AOCvb9X", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @X-Plus 5.json index 7254fd50bb..ab14286d6d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Basic @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFuJ49uH", "name": "QIDI PETG Basic@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFuJ49uH", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.2 nozzle.json index 220a6ce55a..151b6bafd4 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "oi5JKM4fwEYHefs0", "name": "QIDI PETG Rapido @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "oi5JKM4fwEYHefs0", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.4 nozzle.json index 9fe3affac2..9c695c8b5a 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "SZOwb16vrcdtaDzJ", "name": "QIDI PETG Rapido @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "SZOwb16vrcdtaDzJ", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.6 nozzle.json index a550919113..3b0ee18299 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "4LKxL4N0ccD6vZ60", "name": "QIDI PETG Rapido @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "4LKxL4N0ccD6vZ60", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.8 nozzle.json index b56b55d1ff..70e2c8de58 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "rsNDDt3IFUOMYV3O", "name": "QIDI PETG Rapido @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "rsNDDt3IFUOMYV3O", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @X-Plus 5.json index 01a3e6cabe..89af24cc85 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Rapido @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF4S3To3", "name": "QIDI PETG Rapido@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF4S3To3", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.2 nozzle.json index 7708ebba0d..b74a782893 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "k4kLQheLeWOw8bwp", "name": "QIDI PETG Tough @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Tough@X-Plus 5-Series", + "from": "system", + "setting_id": "k4kLQheLeWOw8bwp", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.4 nozzle.json index 5c8c182a2b..46d3107ff9 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "WEyrSDtW2CJeLQmg", "name": "QIDI PETG Tough @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Tough@X-Plus 5-Series", + "from": "system", + "setting_id": "WEyrSDtW2CJeLQmg", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.6 nozzle.json index ad75cc5722..6949cb951d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "Morgo6GIzU3Voc0Q", "name": "QIDI PETG Tough @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Tough@X-Plus 5-Series", + "from": "system", + "setting_id": "Morgo6GIzU3Voc0Q", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.8 nozzle.json index 37c0beddb9..9b02b7f1c8 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "DsoxBXKOjsENLEZf", "name": "QIDI PETG Tough @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Tough@X-Plus 5-Series", + "from": "system", + "setting_id": "DsoxBXKOjsENLEZf", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @X-Plus 5.json index ed1b218139..65bcd87f2d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Tough @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFQ40XeN", "name": "QIDI PETG Tough@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFQ40XeN", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.2 nozzle.json index 03e72feba9..63875362fe 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "2UJnG0rXeU2nCIQL", "name": "QIDI PETG Translucent @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Translucent@X-Plus 5-Series", + "from": "system", + "setting_id": "2UJnG0rXeU2nCIQL", + "instantiation": "true", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.4 nozzle.json index 545bd42538..9730016f67 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "S2DQ7jy5KqbiVNnV", "name": "QIDI PETG Translucent @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Translucent@X-Plus 5-Series", + "from": "system", + "setting_id": "S2DQ7jy5KqbiVNnV", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.6 nozzle.json index 963916f76e..929eff1456 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "G33dlk73weGNFNwg", "name": "QIDI PETG Translucent @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Translucent@X-Plus 5-Series", + "from": "system", + "setting_id": "G33dlk73weGNFNwg", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.8 nozzle.json index 42bf38bde4..b6a99d1f9d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "zqI9F8vplNFfm2pa", "name": "QIDI PETG Translucent @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG Translucent@X-Plus 5-Series", + "from": "system", + "setting_id": "zqI9F8vplNFfm2pa", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @X-Plus 5.json index 94792b7a75..5bedf7bcf2 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG Translucent @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFf0MkD5", "name": "QIDI PETG Translucent@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFf0MkD5", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.4 nozzle.json index 04176974f5..15b1691904 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "cXbQtMQKmAFqwmqK", "name": "QIDI PETG-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "cXbQtMQKmAFqwmqK", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.6 nozzle.json index ce16a13acf..a828f3958b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "YNIWSLXvW6kSPRFG", "name": "QIDI PETG-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "YNIWSLXvW6kSPRFG", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.8 nozzle.json index e1ce42ee0a..19a87d0ea7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "O0lwfGXO3BdPCask", "name": "QIDI PETG-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "O0lwfGXO3BdPCask", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @X-Plus 5.json index 19f7f473dd..91a9dbcc9f 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF4iWKrE", "name": "QIDI PETG-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF4iWKrE", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.4 nozzle.json index 46b3b1176a..3a81d10184 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "zfI1VXQ7E0re78CC", "name": "QIDI PETG-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "zfI1VXQ7E0re78CC", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.6 nozzle.json index 4af6b7db02..77eb2fc3b4 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "zYEbjZPipK4BgHRO", "name": "QIDI PETG-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "zYEbjZPipK4BgHRO", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.8 nozzle.json index bf819e04a9..2388ed7488 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "5ef246YwGEK0eVCr", "name": "QIDI PETG-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PETG-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "5ef246YwGEK0eVCr", + "instantiation": "true", "pressure_advance": [ "0.04" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @X-Plus 5.json index 3bed003091..a278471f44 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PETG-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFdtPd9h", "name": "QIDI PETG-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFdtPd9h", + "instantiation": "false", "box_temperature_range_high": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.2 nozzle.json index 4ec7f05eb9..7ccc28f4ea 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "sfrpgBzPufKwgBCT", "name": "QIDI PLA Basic @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "sfrpgBzPufKwgBCT", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.4 nozzle.json index 20dd378bd2..a0ca3347bd 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "6ZscfuWENwCkdSYE", "name": "QIDI PLA Basic @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "6ZscfuWENwCkdSYE", + "instantiation": "true", "pressure_advance": [ "0.038" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.6 nozzle.json index 574e748c98..ebb3690322 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "pEry2GMq8UJEw7c7", "name": "QIDI PLA Basic @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "pEry2GMq8UJEw7c7", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.8 nozzle.json index 527eb00054..73c062b226 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "MTq8xcAKCWABLI2k", "name": "QIDI PLA Basic @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "MTq8xcAKCWABLI2k", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @X-Plus 5.json index 30e12990e3..5e0fe80a47 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Basic @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF4nQ62r", "name": "QIDI PLA Basic@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF4nQ62r", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.2 nozzle.json index 0078600f36..f70f0cc585 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "54iiCCwizthHtT1v", "name": "QIDI PLA Matte Basic @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Matte Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "54iiCCwizthHtT1v", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.4 nozzle.json index d67aa77dc4..b5a20a483f 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ojnl8sBbBL4QBL8q", "name": "QIDI PLA Matte Basic @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Matte Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "ojnl8sBbBL4QBL8q", + "instantiation": "true", "pressure_advance": [ "0.038" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.6 nozzle.json index 6575396e45..479b0f01d7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "XtZarwF2HIipdHjN", "name": "QIDI PLA Matte Basic @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Matte Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "XtZarwF2HIipdHjN", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.8 nozzle.json index 8c4584a70b..23fa3c1ce8 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "TRkCNQeoDvLBaJMt", "name": "QIDI PLA Matte Basic @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Matte Basic@X-Plus 5-Series", + "from": "system", + "setting_id": "TRkCNQeoDvLBaJMt", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @X-Plus 5.json index 2843092024..f59be1d0c7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Matte Basic @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFughwKn", "name": "QIDI PLA Matte Basic@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFughwKn", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.2 nozzle.json index 3ea3dac12f..e963435867 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "S56TixVPmXr4uFut", "name": "QIDI PLA Rapido @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "S56TixVPmXr4uFut", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.4 nozzle.json index 178fcfd08d..478bd28b07 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KATHrxoL84i7MiVJ", "name": "QIDI PLA Rapido @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "KATHrxoL84i7MiVJ", + "instantiation": "true", "pressure_advance": [ "0.038" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.6 nozzle.json index 2ad1d18a60..f57cabb657 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "YE6WmGAG5Ua6bbap", "name": "QIDI PLA Rapido @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "YE6WmGAG5Ua6bbap", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.8 nozzle.json index ffc9edfb78..ed1b1ef153 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KPqnbBv0Np93O02u", "name": "QIDI PLA Rapido @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "KPqnbBv0Np93O02u", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @X-Plus 5.json index 6327908055..c8292370bb 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFKIQO2W", "name": "QIDI PLA Rapido@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFKIQO2W", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.2 nozzle.json index e469cf1fd1..1de6949d00 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "jlUpp5oaYSWwaNn1", "name": "QIDI PLA Rapido Matte @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Matte@X-Plus 5-Series", + "from": "system", + "setting_id": "jlUpp5oaYSWwaNn1", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.4 nozzle.json index 3f74323770..cf3780c37a 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "E0gYAZUksoFlebuH", "name": "QIDI PLA Rapido Matte @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Matte@X-Plus 5-Series", + "from": "system", + "setting_id": "E0gYAZUksoFlebuH", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.6 nozzle.json index f45479c37f..42deb84165 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "juxpaK6EosaHj2ok", "name": "QIDI PLA Rapido Matte @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Matte@X-Plus 5-Series", + "from": "system", + "setting_id": "juxpaK6EosaHj2ok", + "instantiation": "true", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.8 nozzle.json index 7e4ec99248..e5020c3aa0 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "OlgI3WQA3QLhPsdw", "name": "QIDI PLA Rapido Matte @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Matte@X-Plus 5-Series", + "from": "system", + "setting_id": "OlgI3WQA3QLhPsdw", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @X-Plus 5.json index 9e2380faea..6d66f820ac 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Matte @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF3IKafc", "name": "QIDI PLA Rapido Matte@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF3IKafc", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json index 7506c80541..0a456a70c8 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "t9qUv1IlI5VJ8LoV", "name": "QIDI PLA Rapido Metal @Qidi X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "t9qUv1IlI5VJ8LoV", + "instantiation": "true", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json index e2be1216f3..821ae99c83 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ARcrUoVsGSM0RB1a", "name": "QIDI PLA Rapido Metal @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "ARcrUoVsGSM0RB1a", + "instantiation": "true", "pressure_advance": [ "0.038" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json index 2b3fae0a1e..3dc29e0274 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "A23HjUFAyt4GeHAW", "name": "QIDI PLA Rapido Metal @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "A23HjUFAyt4GeHAW", + "instantiation": "true", "pressure_advance": [ "0.020" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json index e6868b6772..fe0b014127 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "nMpSP1jmsQIUjGPb", "name": "QIDI PLA Rapido Metal @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Rapido Metal@X-Plus 5-Series", + "from": "system", + "setting_id": "nMpSP1jmsQIUjGPb", + "instantiation": "true", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @X-Plus 5.json index bc9f655538..9f94f435be 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Rapido Metal @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFANFm4x", "name": "QIDI PLA Rapido Metal@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFANFm4x", + "instantiation": "false", "filament_type": [ "PLA" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.4 nozzle.json index dfd789a216..32461ff6d1 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "IUU7TApRivYtrrt0", "name": "QIDI PLA Silk @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Silk@X-Plus 5-Series", + "from": "system", + "setting_id": "IUU7TApRivYtrrt0", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.6 nozzle.json index 286c1d3a36..aa4b899180 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "lx9Dqv6EMmZ0C2SD", "name": "QIDI PLA Silk @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA Silk@X-Plus 5-Series", + "from": "system", + "setting_id": "lx9Dqv6EMmZ0C2SD", + "instantiation": "true", "pressure_advance": [ "0.021" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @X-Plus 5.json index 2b6574b104..81a6411737 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA Silk @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF2TQpOO", "name": "QIDI PLA Silk@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF2TQpOO", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.4 nozzle.json index c341f7c71d..9537368024 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "5PocTwpY0SnNzcdc", "name": "QIDI PLA-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "5PocTwpY0SnNzcdc", + "instantiation": "true", "pressure_advance": [ "0.034" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.6 nozzle.json index 5c08e7f67f..2157d07648 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "5NETSLSQlaoR2MYD", "name": "QIDI PLA-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "5NETSLSQlaoR2MYD", + "instantiation": "true", "pressure_advance": [ "0.012" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.8 nozzle.json index 7435222e8b..5dd00e049d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "AUO7iSMEa6GDvM7Y", "name": "QIDI PLA-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PLA-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "AUO7iSMEa6GDvM7Y", + "instantiation": "true", "filament_max_volumetric_speed": [ "18" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @X-Plus 5.json index 390b331556..cf71930b51 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PLA-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFhWrAuP", "name": "QIDI PLA-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFhWrAuP", + "instantiation": "false", "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.4 nozzle.json index 2c2d573713..761944e013 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "FwWut7sJIMbe87XC", "name": "QIDI PPS-CF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "FwWut7sJIMbe87XC", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.6 nozzle.json index 9cc0556490..1547ca8bec 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "gDIuKCdgoP59Xc0G", "name": "QIDI PPS-CF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "gDIuKCdgoP59Xc0G", + "instantiation": "true", "pressure_advance": [ "0.021" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.8 nozzle.json index 573f8e17f8..512bc7617e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "D29sGCB9OI4cTn0S", "name": "QIDI PPS-CF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-CF@X-Plus 5-Series", + "from": "system", + "setting_id": "D29sGCB9OI4cTn0S", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @X-Plus 5.json index b482042819..c70f3c26b2 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-CF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFZOuWrO", "name": "QIDI PPS-CF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFZOuWrO", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.4 nozzle.json index de96ad5f7a..5e6446b802 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "5C6dIIgQOt4NiTu0", "name": "QIDI PPS-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "5C6dIIgQOt4NiTu0", + "instantiation": "true", "pressure_advance": [ "0.03" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.6 nozzle.json index 470839ef59..e88688b456 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "aSd6UW4Mrlxpa15E", "name": "QIDI PPS-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "aSd6UW4Mrlxpa15E", + "instantiation": "true", "pressure_advance": [ "0.021" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.8 nozzle.json index 6cc49dbd68..277492f8e4 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "7JC2zAUgtGu5zSGo", "name": "QIDI PPS-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI PPS-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "7JC2zAUgtGu5zSGo", + "instantiation": "true", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @X-Plus 5.json index f973121e62..61d4c6a502 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI PPS-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFp57RRC", "name": "QIDI PPS-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFp57RRC", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.4 nozzle.json index 5bd3b85fb9..44e8e0df5d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "oMvDD9rKJGcezwpq", "name": "QIDI Support For PAHT @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PAHT@X-Plus 5-Series", + "from": "system", + "setting_id": "oMvDD9rKJGcezwpq", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.6 nozzle.json index 37f474533e..e37712ead6 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "6BhbbuUP6HCVScDd", "name": "QIDI Support For PAHT @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PAHT@X-Plus 5-Series", + "from": "system", + "setting_id": "6BhbbuUP6HCVScDd", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.8 nozzle.json index f28e56c5b1..a568d0cd8a 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "kA4fvvj6xZEhArXv", "name": "QIDI Support For PAHT @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PAHT@X-Plus 5-Series", + "from": "system", + "setting_id": "kA4fvvj6xZEhArXv", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @X-Plus 5.json index 63941c851b..5484c472f5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PAHT @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFXn3Vd9", "name": "QIDI Support For PAHT@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFXn3Vd9", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.4 nozzle.json index 615d9af041..99cc873ddf 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "0xy82KbAJD5uBara", "name": "QIDI Support For PET/PA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PET/PA@X-Plus 5-Series", + "from": "system", + "setting_id": "0xy82KbAJD5uBara", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.6 nozzle.json index 1e0c81424c..e8c4526fc7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "2oCGYFdC4dfpNUw4", "name": "QIDI Support For PET/PA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PET/PA@X-Plus 5-Series", + "from": "system", + "setting_id": "2oCGYFdC4dfpNUw4", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.8 nozzle.json index 2d47d18707..9e9160a2b5 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "hFYahJkYIgmjcuPb", "name": "QIDI Support For PET/PA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI Support For PET/PA@X-Plus 5-Series", + "from": "system", + "setting_id": "hFYahJkYIgmjcuPb", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @X-Plus 5.json index 969fc2bccc..34d1baa32f 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI Support For PET-PA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFqcL5UF", "name": "QIDI Support For PET/PA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFqcL5UF", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.4 nozzle.json index 1f2db1eb25..6be778053d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "ygLg4KVojo7YoG5K", "name": "QIDI TPU 95A-HF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU 95A-HF@X-Plus 5-Series", + "from": "system", + "setting_id": "ygLg4KVojo7YoG5K", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.6 nozzle.json index 94e992d0e9..30e5899f0b 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "K98nPXclatc5HnIx", "name": "QIDI TPU 95A-HF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU 95A-HF@X-Plus 5-Series", + "from": "system", + "setting_id": "K98nPXclatc5HnIx", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.8 nozzle.json index e05faeed65..2f41c696dc 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "pTxBir6QC9KhWrLU", "name": "QIDI TPU 95A-HF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU 95A-HF@X-Plus 5-Series", + "from": "system", + "setting_id": "pTxBir6QC9KhWrLU", + "instantiation": "true", "nozzle_temperature": [ "220" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @X-Plus 5.json index 7b06c92253..c7a7ed62cd 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU 95A-HF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFR1XLMN", "name": "QIDI TPU 95A-HF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFR1XLMN", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "30" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.4 nozzle.json index 592ad5a51c..17ca5e5a60 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "KIIwoI87n5MkT83b", "name": "QIDI TPU-Aero @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU-Aero@X-Plus 5-Series", + "from": "system", + "setting_id": "KIIwoI87n5MkT83b", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.6 nozzle.json index f18b67f608..03b11ef242 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "eUNygrv7weqgX7e0", "name": "QIDI TPU-Aero @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU-Aero@X-Plus 5-Series", + "from": "system", + "setting_id": "eUNygrv7weqgX7e0", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @X-Plus 5.json index 4ede2d7d6e..fd8964a9f9 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-Aero @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFMDHOcT", "name": "QIDI TPU-Aero@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFMDHOcT", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "30" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.4 nozzle.json index 8e88b23151..8857639b58 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "AtsowCGhOIw4GeRJ", "name": "QIDI TPU-GF @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "AtsowCGhOIw4GeRJ", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.6 nozzle.json index 5a7687b51c..d5a590bf3e 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "wqk4I1KaRyLEm12W", "name": "QIDI TPU-GF @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "wqk4I1KaRyLEm12W", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.8 nozzle.json index 2fe800d6ab..4349ea9820 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "o2JjRsoi03ST3Wh2", "name": "QIDI TPU-GF @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI TPU-GF@X-Plus 5-Series", + "from": "system", + "setting_id": "o2JjRsoi03ST3Wh2", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @X-Plus 5.json index 90de30cb02..d4a4e6cd55 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI TPU-GF @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF9EHUKK", "name": "QIDI TPU-GF@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF9EHUKK", + "instantiation": "false", "cool_plate_temp_initial_layer": [ "30" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.4 nozzle.json index ae7b99531e..b924628294 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "RzZGtHGu2xKASwwu", "name": "QIDI UltraPA @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA@X-Plus 5-Series", + "from": "system", + "setting_id": "RzZGtHGu2xKASwwu", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.6 nozzle.json index e9bfbe4362..7f2e0c6f76 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "0seF33ojhYF6lNM4", "name": "QIDI UltraPA @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA@X-Plus 5-Series", + "from": "system", + "setting_id": "0seF33ojhYF6lNM4", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.8 nozzle.json index 6f03ff7b5a..c2441fd612 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "vfr7Lv94OHi4KOCw", "name": "QIDI UltraPA @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA@X-Plus 5-Series", + "from": "system", + "setting_id": "vfr7Lv94OHi4KOCw", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @X-Plus 5.json index 75a89479e2..84bcd1025d 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFWDe7YH", "name": "QIDI UltraPA@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFWDe7YH", + "instantiation": "false", "box_temperature_range_high": [ "55" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.4 nozzle.json index c88635f447..5988080581 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "8h1ITuLzHYf0J4NA", "name": "QIDI UltraPA-CF25 @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA-CF25@X-Plus 5-Series", + "from": "system", + "setting_id": "8h1ITuLzHYf0J4NA", + "instantiation": "true", "compatible_printers": [ "Qidi X-Plus 5 0.4 nozzle" ] diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.6 nozzle.json index 66ac797bb8..c36fea25b1 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "WK63qDyLkG4fznPW", "name": "QIDI UltraPA-CF25 @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA-CF25@X-Plus 5-Series", + "from": "system", + "setting_id": "WK63qDyLkG4fznPW", + "instantiation": "true", "pressure_advance": [ "0.022" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.8 nozzle.json index 282fed912a..4e729f5d62 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "53sirpAAiDOx0c8P", "name": "QIDI UltraPA-CF25 @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI UltraPA-CF25@X-Plus 5-Series", + "from": "system", + "setting_id": "53sirpAAiDOx0c8P", + "instantiation": "true", "pressure_advance": [ "0.02" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @X-Plus 5.json index 82c261fbd5..9e8518cacb 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI UltraPA-CF25 @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OF9PELEb", "name": "QIDI UltraPA-CF25@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OF9PELEb", + "instantiation": "false", "box_temperature_range_high": [ "65" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.4 nozzle.json index 2232226b78..eafa4d90e7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "gIumq0YfeZrNDTZt", "name": "QIDI WOOD Rapido @Qidi X-Plus 5 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI WOOD Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "gIumq0YfeZrNDTZt", + "instantiation": "true", "pressure_advance": [ "0.044" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.6 nozzle.json index b9ecf201ba..2067b842b7 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "qUjZ8AUjivOk8uCf", "name": "QIDI WOOD Rapido @Qidi X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI WOOD Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "qUjZ8AUjivOk8uCf", + "instantiation": "true", "pressure_advance": [ "0.024" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.8 nozzle.json index fc15698443..6cd6d5e192 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @Qidi X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "setting_id": "A2kztfG9PA7Qxh7r", "name": "QIDI WOOD Rapido @Qidi X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "QIDI WOOD Rapido@X-Plus 5-Series", + "from": "system", + "setting_id": "A2kztfG9PA7Qxh7r", + "instantiation": "true", "pressure_advance": [ "0.012" ], diff --git a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @X-Plus 5.json index efbe41d51d..280d05e09c 100644 --- a/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @X-Plus 5.json +++ b/resources/profiles/Qidi/filament/X5/QIDI WOOD Rapido @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "filament", - "filament_id": "OFvdZ2bx", "name": "QIDI WOOD Rapido@X-Plus 5-Series", - "from": "system", - "instantiation": "false", "inherits": "fdm_filament_x5_common", + "from": "system", + "filament_id": "OFvdZ2bx", + "instantiation": "false", "additional_cooling_fan_speed": [ "100" ], diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json index a085ce6cfe..bd2398ae7a 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -63,15 +63,19 @@ "112x112" ], "machine_max_jerk_e": [ + "2", "2" ], "machine_max_jerk_x": [ + "8", "8" ], "machine_max_jerk_y": [ + "8", "8" ], "machine_max_jerk_z": [ + "3", "3" ], "extruder_clearance_radius": "70", diff --git a/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json index 6a0a91b2ac..623bbf841d 100644 --- a/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json @@ -33,18 +33,23 @@ "machine_end_gcode": "DISABLE_BOX_HEATER\nM141 S0\nM140 S0\nBUFFER_MONITORING ENABLE=0\nDISABLE_ALL_SENSOR\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nUNLOAD_FILAMENT T=[current_extruder]\nG0 Y270 F12000\nG0 X90 Y270 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}\nM104 S0", "machine_load_filament_time": "35", "machine_max_jerk_e": [ + "4", "4" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "4", "4" ], "machine_max_speed_z": [ + "20", "20" ], "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Qidi/machine/Qidi Q2C 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q2C 0.4 nozzle.json index 9d4683885f..84f3e8700a 100644 --- a/resources/profiles/Qidi/machine/Qidi Q2C 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q2C 0.4 nozzle.json @@ -33,18 +33,23 @@ "machine_end_gcode": "DISABLE_BOX_HEATER\nM140 S0\nBUFFER_MONITORING ENABLE=0\nDISABLE_ALL_SENSOR\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nUNLOAD_FILAMENT T=[current_extruder]\nG0 Y270 F12000\nG0 X90 Y270 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}\nM104 S0", "machine_load_filament_time": "35", "machine_max_jerk_e": [ + "4", "4" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "4", "4" ], "machine_max_speed_z": [ + "20", "20" ], "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json index ef26c0a620..f7cda2a1cd 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json @@ -30,31 +30,40 @@ "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nMOVE_TO_TRASH\n{if layer_z <=25}\nG1 Z25\n{endif}\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 E[retraction_length] F300\nG1 X180 F8000\nG1 Y380\n{if layer_z <=25}\nG1 Z[layer_z]\n{endif}\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}", "machine_end_gcode": "SET_PRINT_MAIN_STATUS MAIN_STATUS=print_end\nDISABLE_BOX_HEATER\nM141 S0\nM140 S0\nDISABLE_ALL_SENSOR\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nUNLOAD_FILAMENT T=[current_extruder]\nG0 Y380 F12000\nG0 X128 Y380 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}\nM104 S0\nPRINT_END", "machine_max_jerk_e": [ + "4", "4" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "4", "4" ], "machine_max_speed_z": [ + "20", "20" ], "machine_pause_gcode": "PAUSE", "machine_max_acceleration_x": [ + "30000", "30000" ], "machine_max_acceleration_y": [ + "30000", "30000" ], "machine_max_speed_x": [ + "800", "800" ], "machine_max_speed_y": [ + "800", "800" ], "machine_start_gcode": ";===== PRINT_PHASE_INIT =====\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nSET_PRINT_MAIN_STATUS MAIN_STATUS=print_start\nM220 S100\nM221 S100\nDISABLE_ALL_SENSOR\nM1002 R1\nM107\nCLEAR_PAUSE\nM140 S[bed_temperature_initial_layer_single]\nM141 S[chamber_temperature]\nG29.0\nSET_PRINT_SUB_STATUS SUB_STATUS=tool_head_reset\nG28\n\n;===== BOX_PREPAR =====\nSET_PRINT_SUB_STATUS SUB_STATUS=change_filament\nBOX_PRINT_START EXTRUDER=[initial_no_support_extruder] HOTENDTEMP={nozzle_temperature_range_high[initial_tool]}\nM400\nEXTRUSION_AND_FLUSH HOTEND=[nozzle_temperature_initial_layer]\n\n;===== CLEAR_NOZZLE =====\nSET_PRINT_SUB_STATUS SUB_STATUS=flush_filament\nG1 Z20 F480\nMOVE_TO_TRASH\nG1 Y403.5 F2000\n{if chamber_temperature[0] == 0}\nM106 P3 S[during_print_exhaust_fan_speed]\n{else}\nM106 P3 S0\n{endif}\nM1004\nM106 S0\nM109 S[nozzle_temperature_initial_layer]\nG92 E0\nM83\nG1 E5 F80\nG1 E250 F300\nM400\nM106 S255\nG1 E-3 F1000\nM104 S140\nSET_PRINT_SUB_STATUS SUB_STATUS=clear_nozzle\nM109.1 S{nozzle_temperature_initial_layer[0]-30}\nM204 S10000\nG1 Y403 F2000\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 Y395 F6000\nG1 X188\nG1 Z-0.2 F480\nM106 S255\nM109.1 S150\nG91\nG1 X15 F200\nG1 Y2\nG1 X-15\nG1 Y-2\nG1 X15\nG90\nG2 I0.5 J0.5 F480\nG2 I0.5 J0.5\nG2 I0.5 J0.5\nG1 Z10\nG1 Y383 F12000\nG1 X116\nG1 Y403\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 X195 Y195\nM106 S0\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_bed_temp\nM190 S[bed_temperature_initial_layer_single]\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_chamber_temp\nM191 S[chamber_temperature]\nG1 Y0 F15000\nG1 X15\nG1 X3 F5000\nG4 P1000\nG1 X4 F1000\nG1 X3 F5000\nG4 P1000\nG1 E-4 F1800\nG1 X15 F3000\nG1 X20 Y20 F15000\nSET_PRINT_SUB_STATUS SUB_STATUS=z_tilt_adjust\nZ_TILT_ADJUST\nSET_PRINT_SUB_STATUS SUB_STATUS=auto_bed_adjust\nG29\nM1002 A1\nG1 X195 Y195 Z10 F20000\nG92_ Z{10 - ((nozzle_temperature_initial_layer[initial_tool] - 130) / 14 - 5.0) / 100}\nG0 Y1\nM109 S[nozzle_temperature_initial_layer]\nENABLE_ALL_SENSOR\n\n;===== PRINT_START =====\n; LAYER_HEIGHT: 0.2\nT[initial_tool]\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nprobe samples=1\nG91\nG0 Z0.6 F480\nG90\nG1 X175 Y1 F20000\nG1 E5 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 X215 E20 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 Z1 F480\nSET_PRINT_MAIN_STATUS MAIN_STATUS=printing", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json index a7d2f09195..21c4b29044 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json @@ -68,21 +68,27 @@ "96x96" ], "machine_max_jerk_e": [ + "4", "4" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "4", "4" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_speed_z": [ + "20", "20" ], "retract_lift_below": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 5 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 5 0.4 nozzle.json index f23f86af2a..7ee84157f8 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 5 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 5 0.4 nozzle.json @@ -32,30 +32,39 @@ "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\n{if layer_z + 0.4 > max_print_height}\nG2 Z{max_print_height} I0.86 J0.86 P1 F20000 ; spiral lift a little\n{else}\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\n{endif}\nMOVE_TO_TRASH\n{if layer_z <=25}\nG1 Z25\n{endif}\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 E[retraction_length] F300\nG1 X140 F8000\nG1 Y319\n{if layer_z <=25}\nG1 Z[layer_z]\n{endif}\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}", "machine_end_gcode": "SET_PRINT_MAIN_STATUS MAIN_STATUS=print_end\nDISABLE_BOX_HEATER\nM141 S0\nM140 S0\nDISABLE_ALL_SENSOR\nG1 E-3 F1800\n{if max_layer_z + 3 > max_print_height}\nG0 Z{max_print_height} F600\n{else}\nG0 Z{max_layer_z + 3} F600\n{endif}\nUNLOAD_FILAMENT T=[current_extruder]\nG0 Y320 F12000\nG0 X105 Y320 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}\nM104 S0\nPRINT_END", "machine_max_acceleration_x": [ + "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", "20000" ], "machine_max_jerk_e": [ + "4", "4" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "4", "4" ], "machine_max_speed_x": [ + "600", "600" ], "machine_max_speed_y": [ + "600", "600" ], "machine_max_speed_z": [ + "20", "20" ], "machine_pause_gcode": "PAUSE", diff --git a/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5 0.2 nozzle.json index 6ef2deee1a..290b2a8785 100644 --- a/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "ojwggKwtZ95dDdGn", "name": "0.08mm High Quality @X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "ojwggKwtZ95dDdGn", + "instantiation": "true", "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5.json b/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5.json index 5b76c79ef4..3ffa85deba 100644 --- a/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.08mm High Quality @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "pdbmnAHtrlkeD1D6", "name": "0.08mm High Quality @X-Plus 5", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "pdbmnAHtrlkeD1D6", + "instantiation": "true", "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.10mm Standard @X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/process/0.10mm Standard @X-Plus 5 0.2 nozzle.json index a8a9aa5f37..79c6ac4712 100644 --- a/resources/profiles/Qidi/process/0.10mm Standard @X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/process/0.10mm Standard @X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "3k8N3voNC9Kp0Ov6", "name": "0.10mm Standard @X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "3k8N3voNC9Kp0Ov6", + "instantiation": "true", "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.12mm Balanced Quality @X-Plus 5 0.2 nozzle.json b/resources/profiles/Qidi/process/0.12mm Balanced Quality @X-Plus 5 0.2 nozzle.json index 1c1d304ccd..5dc8f6532b 100644 --- a/resources/profiles/Qidi/process/0.12mm Balanced Quality @X-Plus 5 0.2 nozzle.json +++ b/resources/profiles/Qidi/process/0.12mm Balanced Quality @X-Plus 5 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "O20HfmdyTRg2xayA", "name": "0.12mm Balanced Quality @X-Plus 5 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "O20HfmdyTRg2xayA", + "instantiation": "true", "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.12mm High Quality @X-Plus 5.json b/resources/profiles/Qidi/process/0.12mm High Quality @X-Plus 5.json index a74aecb369..d2b490a4b1 100644 --- a/resources/profiles/Qidi/process/0.12mm High Quality @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.12mm High Quality @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "xWoxLO8XiKAOEvPO", "name": "0.12mm High Quality @X-Plus 5", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "xWoxLO8XiKAOEvPO", + "instantiation": "true", "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.16mm High Quality @X-Plus 5.json b/resources/profiles/Qidi/process/0.16mm High Quality @X-Plus 5.json index 54f20f7324..7d0d689ddb 100644 --- a/resources/profiles/Qidi/process/0.16mm High Quality @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.16mm High Quality @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "7hYw7osV25Xu2yiu", "name": "0.16mm High Quality @X-Plus 5", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "7hYw7osV25Xu2yiu", + "instantiation": "true", "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.16mm Standard @X-Plus 5.json b/resources/profiles/Qidi/process/0.16mm Standard @X-Plus 5.json index 5399e693aa..1501ed2daf 100644 --- a/resources/profiles/Qidi/process/0.16mm Standard @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.16mm Standard @X-Plus 5.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "xP7mco0WGscmPNoV", "name": "0.16mm Standard @X-Plus 5", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "xP7mco0WGscmPNoV", + "instantiation": "true", "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.18mm Balanced Quality @X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/process/0.18mm Balanced Quality @X-Plus 5 0.6 nozzle.json index 85d94d49a7..50c7af3c16 100644 --- a/resources/profiles/Qidi/process/0.18mm Balanced Quality @X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/process/0.18mm Balanced Quality @X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "kj7YrKOrYowWXXrY", "name": "0.18mm Balanced Quality @X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "kj7YrKOrYowWXXrY", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/Qidi/process/0.20mm High Quality @X-Plus 5.json b/resources/profiles/Qidi/process/0.20mm High Quality @X-Plus 5.json index 4f8c7b4ef4..5fdcac42e1 100644 --- a/resources/profiles/Qidi/process/0.20mm High Quality @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.20mm High Quality @X-Plus 5.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "azERQAEOdeNEo2z7", "name": "0.20mm High Quality @X-Plus 5", - "from": "system", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "azERQAEOdeNEo2z7", "instantiation": "true", "bottom_shell_layers": "3", "bridge_flow": "1", diff --git a/resources/profiles/Qidi/process/0.20mm Standard @X-Plus 5.json b/resources/profiles/Qidi/process/0.20mm Standard @X-Plus 5.json index decaceecae..49a75ca11b 100644 --- a/resources/profiles/Qidi/process/0.20mm Standard @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.20mm Standard @X-Plus 5.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ug7kxxCLKKE7MoJW", "name": "0.20mm Standard @X-Plus 5", - "from": "system", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "ug7kxxCLKKE7MoJW", "instantiation": "true", "bridge_flow": "1", "default_acceleration": [ diff --git a/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.6 nozzle.json index 16e25dcef3..bdccab0dbb 100644 --- a/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "BWwslzDWus0iHZM8", "name": "0.24mm Balanced Quality @X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "BWwslzDWus0iHZM8", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.8 nozzle.json index e7d69b3f09..65649a82e2 100644 --- a/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/process/0.24mm Balanced Quality @X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "TdXf6dJK5dAiFtIW", "name": "0.24mm Balanced Quality @X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "TdXf6dJK5dAiFtIW", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/Qidi/process/0.24mm Standard @X-Plus 5.json b/resources/profiles/Qidi/process/0.24mm Standard @X-Plus 5.json index 8a435e69e7..952d161781 100644 --- a/resources/profiles/Qidi/process/0.24mm Standard @X-Plus 5.json +++ b/resources/profiles/Qidi/process/0.24mm Standard @X-Plus 5.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "fiMTwk6ObF3WNpi5", "name": "0.24mm Standard @X-Plus 5", - "from": "system", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "fiMTwk6ObF3WNpi5", "instantiation": "true", "bridge_flow": "1", "default_acceleration": [ diff --git a/resources/profiles/Qidi/process/0.30mm Standard @X-Plus 5 0.6 nozzle.json b/resources/profiles/Qidi/process/0.30mm Standard @X-Plus 5 0.6 nozzle.json index a297f33bac..5024f95495 100644 --- a/resources/profiles/Qidi/process/0.30mm Standard @X-Plus 5 0.6 nozzle.json +++ b/resources/profiles/Qidi/process/0.30mm Standard @X-Plus 5 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "ZHUAMUGv0HI3h8fQ", "name": "0.30mm Standard @X-Plus 5 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "ZHUAMUGv0HI3h8fQ", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/Qidi/process/0.32mm Balanced Quality @X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/process/0.32mm Balanced Quality @X-Plus 5 0.8 nozzle.json index be02d140d6..d063b5a735 100644 --- a/resources/profiles/Qidi/process/0.32mm Balanced Quality @X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/process/0.32mm Balanced Quality @X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "Vl4hMKR69J1JcquX", "name": "0.32mm Balanced Quality @X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "Vl4hMKR69J1JcquX", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/Qidi/process/0.40mm Standard @X-Plus 5 0.8 nozzle.json b/resources/profiles/Qidi/process/0.40mm Standard @X-Plus 5 0.8 nozzle.json index cb3f30c20e..343fdc744b 100644 --- a/resources/profiles/Qidi/process/0.40mm Standard @X-Plus 5 0.8 nozzle.json +++ b/resources/profiles/Qidi/process/0.40mm Standard @X-Plus 5 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "6EBzl1Pg5Px36Cu6", "name": "0.40mm Standard @X-Plus 5 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_n_common", + "from": "system", + "setting_id": "6EBzl1Pg5Px36Cu6", + "instantiation": "true", "bridge_flow": "1", "bridge_speed": [ "30" diff --git a/resources/profiles/RH3D.json b/resources/profiles/RH3D.json index 3e177c5efd..09b413845f 100644 --- a/resources/profiles/RH3D.json +++ b/resources/profiles/RH3D.json @@ -1,6 +1,6 @@ { "name": "RH3D", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "RH3D - printer profiles", "machine_model_list": [ diff --git a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.2 nozzle.json b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.2 nozzle.json index cc2c23cfd2..0a5e6fc99a 100644 --- a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.2 nozzle.json +++ b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.2 nozzle.json @@ -1,14 +1,14 @@ -{ - "type": "machine", - "name": "E3NG v1.2S - 0.2 nozzle", - "printer_model": "E3NG v1.2S", - "inherits": "fdm_common_E3NG v1.2S", - "from": "system", - "setting_id": "gPm0noz1896R4GyO", - "instantiation": "true", - "default_print_profile": "0.10mm Standard @E3NG v1.2S", - "nozzle_diameter": [ - "0.2" - ], - "printer_variant": "0.2" -} +{ + "type": "machine", + "name": "E3NG v1.2S - 0.2 nozzle", + "inherits": "fdm_common_E3NG v1.2S", + "from": "system", + "setting_id": "gPm0noz1896R4GyO", + "instantiation": "true", + "printer_model": "E3NG v1.2S", + "default_print_profile": "0.10mm Standard @E3NG v1.2S", + "nozzle_diameter": [ + "0.2" + ], + "printer_variant": "0.2" +} diff --git a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.3 nozzle.json b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.3 nozzle.json index 7c3e5e837f..0feb4065cb 100644 --- a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.3 nozzle.json +++ b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.3 nozzle.json @@ -1,14 +1,14 @@ -{ - "type": "machine", - "name": "E3NG v1.2S - 0.3 nozzle", - "printer_model": "E3NG v1.2S", - "inherits": "fdm_common_E3NG v1.2S", - "from": "system", - "setting_id": "UQ67wIWTbJiUiPoy", - "instantiation": "true", - "default_print_profile": "0.15mm Standard @E3NG v1.2S", - "nozzle_diameter": [ - "0.3" - ], - "printer_variant": "0.3" -} +{ + "type": "machine", + "name": "E3NG v1.2S - 0.3 nozzle", + "inherits": "fdm_common_E3NG v1.2S", + "from": "system", + "setting_id": "UQ67wIWTbJiUiPoy", + "instantiation": "true", + "printer_model": "E3NG v1.2S", + "default_print_profile": "0.15mm Standard @E3NG v1.2S", + "nozzle_diameter": [ + "0.3" + ], + "printer_variant": "0.3" +} diff --git a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.4 nozzle.json b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.4 nozzle.json index a0ee4cae85..d199950c27 100644 --- a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.4 nozzle.json +++ b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.4 nozzle.json @@ -1,14 +1,14 @@ -{ - "type": "machine", - "name": "E3NG v1.2S - 0.4 nozzle", - "printer_model": "E3NG v1.2S", - "inherits": "fdm_common_E3NG v1.2S", - "from": "system", - "setting_id": "Ngr03MsSBAkmFnld", - "instantiation": "true", - "default_print_profile": "0.20mm Standard @E3NG v1.2S", - "nozzle_diameter": [ - "0.4" - ], - "printer_variant": "0.4" -} +{ + "type": "machine", + "name": "E3NG v1.2S - 0.4 nozzle", + "inherits": "fdm_common_E3NG v1.2S", + "from": "system", + "setting_id": "Ngr03MsSBAkmFnld", + "instantiation": "true", + "printer_model": "E3NG v1.2S", + "default_print_profile": "0.20mm Standard @E3NG v1.2S", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4" +} diff --git a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.5 nozzle.json b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.5 nozzle.json index 12131e5f84..0d1491ef32 100644 --- a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.5 nozzle.json +++ b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.5 nozzle.json @@ -1,14 +1,14 @@ -{ - "type": "machine", - "name": "E3NG v1.2S - 0.5 nozzle", - "printer_model": "E3NG v1.2S", - "inherits": "fdm_common_E3NG v1.2S", - "from": "system", - "setting_id": "GSUiav9EILSf8XF4", - "instantiation": "true", - "default_print_profile": "0.20mm Standard @E3NG v1.2S", - "nozzle_diameter": [ - "0.5" - ], - "printer_variant": "0.5" -} +{ + "type": "machine", + "name": "E3NG v1.2S - 0.5 nozzle", + "inherits": "fdm_common_E3NG v1.2S", + "from": "system", + "setting_id": "GSUiav9EILSf8XF4", + "instantiation": "true", + "printer_model": "E3NG v1.2S", + "default_print_profile": "0.20mm Standard @E3NG v1.2S", + "nozzle_diameter": [ + "0.5" + ], + "printer_variant": "0.5" +} diff --git a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.6 nozzle.json b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.6 nozzle.json index c8288a67bf..a04ef63e45 100644 --- a/resources/profiles/RH3D/machine/E3NG v1.2S - 0.6 nozzle.json +++ b/resources/profiles/RH3D/machine/E3NG v1.2S - 0.6 nozzle.json @@ -1,14 +1,14 @@ -{ - "type": "machine", - "name": "E3NG v1.2S - 0.6 nozzle", - "printer_model": "E3NG v1.2S", - "inherits": "fdm_common_E3NG v1.2S", - "from": "system", - "setting_id": "jVNTcmQwQIwJMfFd", - "instantiation": "true", - "default_print_profile": "0.25mm Standard @E3NG v1.2S", - "nozzle_diameter": [ - "0.6" - ], - "printer_variant": "0.6" -} +{ + "type": "machine", + "name": "E3NG v1.2S - 0.6 nozzle", + "inherits": "fdm_common_E3NG v1.2S", + "from": "system", + "setting_id": "jVNTcmQwQIwJMfFd", + "instantiation": "true", + "printer_model": "E3NG v1.2S", + "default_print_profile": "0.25mm Standard @E3NG v1.2S", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json index 8814f25e0c..516ad310e1 100644 --- a/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json @@ -1,11 +1,11 @@ { "type": "machine", "name": "VIRTU E3 - 0.2 nozzle", - "printer_model": "VIRTU E3", "inherits": "fdm_common_VIRTU E3", "from": "system", "setting_id": "NEqwtUJ9txtcf1vY", "instantiation": "true", + "printer_model": "VIRTU E3", "default_print_profile": "0.10mm Standard @VIRTU E3", "nozzle_diameter": [ "0.2" diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json index 4c27b80bb8..1a9a5dfe55 100644 --- a/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json @@ -1,11 +1,11 @@ { "type": "machine", "name": "VIRTU E3 - 0.3 nozzle", - "printer_model": "VIRTU E3", "inherits": "fdm_common_VIRTU E3", "from": "system", "setting_id": "3PjlEiZxmdLJjoGw", "instantiation": "true", + "printer_model": "VIRTU E3", "default_print_profile": "0.15mm Standard @VIRTU E3", "nozzle_diameter": [ "0.3" diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json index 7b02993a2b..2f78ffc1ca 100644 --- a/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json @@ -1,11 +1,11 @@ { "type": "machine", "name": "VIRTU E3 - 0.4 nozzle", - "printer_model": "VIRTU E3", "inherits": "fdm_common_VIRTU E3", "from": "system", "setting_id": "mYCTx4ovF6z0STDL", "instantiation": "true", + "printer_model": "VIRTU E3", "default_print_profile": "0.20mm Standard @VIRTU E3", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json index 660dd35305..e8b64a12b3 100644 --- a/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json @@ -1,11 +1,11 @@ { "type": "machine", "name": "VIRTU E3 - 0.5 nozzle", - "printer_model": "VIRTU E3", "inherits": "fdm_common_VIRTU E3", "from": "system", "setting_id": "iMnENFt2zw6UTcbM", "instantiation": "true", + "printer_model": "VIRTU E3", "default_print_profile": "0.20mm Standard @VIRTU E3", "nozzle_diameter": [ "0.5" diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json index bce4e91736..8963f1b68a 100644 --- a/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json @@ -1,11 +1,11 @@ { "type": "machine", "name": "VIRTU E3 - 0.6 nozzle", - "printer_model": "VIRTU E3", "inherits": "fdm_common_VIRTU E3", "from": "system", "setting_id": "T1RuDWhyFkI1GH1h", "instantiation": "true", + "printer_model": "VIRTU E3", "default_print_profile": "0.25mm Standard @VIRTU E3", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Raise3D.json b/resources/profiles/Raise3D.json index 5f98b967d4..740c9c33e6 100644 --- a/resources/profiles/Raise3D.json +++ b/resources/profiles/Raise3D.json @@ -1,7 +1,7 @@ { "name": "Raise3D", "url": "", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Raise3D configurations", "machine_model_list": [ diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json index 64b55dffaa..73d4a4344e 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "300", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json index 5275f02ccf..97eee4b9c3 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "300", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json index 59b86fd468..2d42bf5b53 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "300", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json index e576937531..a70c9d4583 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "605", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json index a7da5981f0..69fa4fcb07 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "605", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json index 2ee32e65d3..d7274d5185 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json @@ -26,65 +26,98 @@ "0x300" ], "printable_height": "605", - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "3000", + "3000", "3000", "3000" ], "machine_max_acceleration_extruding": [ + "1000", + "300", "1000", "300" ], "machine_max_acceleration_retracting": [ + "3000", + "1500", "3000", "1500" ], "machine_max_acceleration_travel": [ + "1500", + "500", "1500", "500" ], "machine_max_acceleration_x": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index 743333f9aa..4f161b0001 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -1,6 +1,6 @@ { "name": "RatRig", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ diff --git a/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json b/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json index d45720cf60..6086cfa0e8 100644 --- a/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @RatRig", - "inherits": "fdm_filament_abs", "renamed_from": "RatRig Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0BepsauXBs5bxPYO", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json index 3d071c779a..19cc67c606 100644 --- a/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS BigNozzle @RatRig", - "inherits": "fdm_filament_abs", "renamed_from": "RatRig BigNozzle ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "4GJ4GHOuApWBbQoS", "filament_id": "OFnyHfcv", diff --git a/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json b/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json index 9b70da5bab..83cbfc3240 100644 --- a/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @RatRig", - "inherits": "fdm_filament_asa", "renamed_from": "RatRig Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "cogJbKPAXzyCQgvf", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json index f6f85f78e7..6a66e5856c 100644 --- a/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA BigNozzle @RatRig", - "inherits": "fdm_filament_asa", "renamed_from": "RatRig BigNozzle ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "n2V9gkhbqWJzsQBK", "filament_id": "OF4GM5qX", diff --git a/resources/profiles/Ratrig/filament/Generic PA @RatRig.json b/resources/profiles/Ratrig/filament/Generic PA @RatRig.json index 58d6757d78..15f498d4cf 100644 --- a/resources/profiles/Ratrig/filament/Generic PA @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PA @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @RatRig", - "inherits": "fdm_filament_pa", "renamed_from": "RatRig Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "5rpTzhFjS6Ar4Xy8", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json b/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json index 5b0ea38d75..fe0c69592a 100644 --- a/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @RatRig", - "inherits": "fdm_filament_pa", "renamed_from": "RatRig Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ps7duiwT8adNshEO", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Ratrig/filament/Generic PC @RatRig.json b/resources/profiles/Ratrig/filament/Generic PC @RatRig.json index c6dc89cce5..6ca17d3395 100644 --- a/resources/profiles/Ratrig/filament/Generic PC @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PC @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @RatRig", - "inherits": "fdm_filament_pc", "renamed_from": "RatRig Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "7x5VtUIevdAmBqqA", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json b/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json index d3e06685b5..2a4e89addc 100644 --- a/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PCTG @RatRig", - "inherits": "fdm_filament_pet", "renamed_from": "RatRig Generic PCTG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "JMTUqdhoQzCb6ZxJ", "filament_id": "OFu1evlr", diff --git a/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json index 2e47eb6765..a197e62102 100644 --- a/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PCTG BigNozzle @RatRig", - "inherits": "fdm_filament_pctg", "renamed_from": "RatRig BigNozzle PCTG", + "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "HPaol79uY9NdhasQ", "filament_id": "OFXW4CDh", diff --git a/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json b/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json index b0182712b1..633c0a30db 100644 --- a/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @RatRig", - "inherits": "fdm_filament_pet", "renamed_from": "RatRig Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "6p3FfhhSIAOQGEzT", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json index 213f41628c..6b3c70b39d 100644 --- a/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG BigNozzle @RatRig", - "inherits": "fdm_filament_pet", "renamed_from": "RatRig BigNozzle PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "pRM6IVX5T3y6Ywj4", "filament_id": "OFvD0Qqt", diff --git a/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json b/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json index b8a33f4da4..c8a70e0751 100644 --- a/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @RatRig", - "inherits": "fdm_filament_pla", "renamed_from": "RatRig Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "BsQA6ChWHTDUSlii", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json index 08d546aafc..50774b8799 100644 --- a/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA BigNozzle @RatRig", - "inherits": "fdm_filament_pla", "renamed_from": "RatRig BigNozzle PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "WEI4QiKyANQOK7dG", "filament_id": "OFqFRiLb", diff --git a/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json b/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json index 288c892f09..4771b2caad 100644 --- a/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @RatRig", - "inherits": "fdm_filament_pla", "renamed_from": "RatRig Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ai3I13fL5giqq5LW", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json b/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json index 016b146181..09e8cad05a 100644 --- a/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @RatRig", - "inherits": "fdm_filament_pva", "renamed_from": "RatRig Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "y6DJYhqAmxMng8Kf", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json b/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json index e8ea6176b7..6ed3edbeb0 100644 --- a/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @RatRig", - "inherits": "fdm_filament_tpu", "renamed_from": "RatRig Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "dAIGKmZctSRhP1Lu", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json index 4714f57d5a..8bd40ac062 100644 --- a/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU BigNozzle @RatRig", - "inherits": "fdm_filament_tpu", "renamed_from": "RatRig BigNozzle TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "9UWg2cO61XFdlWxo", "filament_id": "OF5tX6va", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.8 nozzle.json index 28412dd804..db452dcf21 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.8 nozzle.json @@ -2,10 +2,10 @@ "type": "machine", "name": "RatRig V-Core 4 300 0.8 nozzle", "inherits": "fdm_klipper_common", - "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "from": "system", "setting_id": "feTeGuFkLzWFFSC4", "instantiation": "true", + "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "printer_model": "RatRig V-Core 4 300", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.8 nozzle.json index a40343b574..649efabebf 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.8 nozzle.json @@ -2,10 +2,10 @@ "type": "machine", "name": "RatRig V-Core 4 400 0.8 nozzle", "inherits": "fdm_klipper_common", - "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "from": "system", "setting_id": "DQ7Lzsuk87A4qtav", "instantiation": "true", + "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "printer_model": "RatRig V-Core 4 400", "printer_variant": "0.8", "nozzle_diameter": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.8 nozzle.json index 828b2d8711..75f518c286 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.8 nozzle.json @@ -2,10 +2,10 @@ "type": "machine", "name": "RatRig V-Core 4 500 0.8 nozzle", "inherits": "fdm_klipper_common", - "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "from": "system", "setting_id": "VMKIyofeEpPvUvkY", "instantiation": "true", + "default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8", "printer_model": "RatRig V-Core 4 500", "printer_variant": "0.8", "nozzle_diameter": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json index 9e3f45189c..d5cae37925 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.4 nozzle.json @@ -24,62 +24,92 @@ "0x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,12 +123,15 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ @@ -106,12 +139,15 @@ "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.5 nozzle.json index 51856c4305..be901905a7 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.5 nozzle.json @@ -24,62 +24,92 @@ "0x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.25", "0.25" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.6 nozzle.json index f255b58824..5fbbf455cc 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.6 nozzle.json @@ -24,62 +24,92 @@ "0x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.8 nozzle.json index cca40b5979..56f1e96dac 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 0.8 nozzle.json @@ -24,62 +24,92 @@ "0x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.4 nozzle.json index 4b49fc36a7..e6789ac2f4 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.5 nozzle.json index 5e9a55e6e6..532351fa0e 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.6 nozzle.json index 69848e1743..196b0970e3 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.8 nozzle.json index 0018a5d250..1a5b501ca9 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.4 nozzle.json index 902ba9a044..24dff4f024 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.5 nozzle.json index 873385c476..37bc1f5f00 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.6 nozzle.json index b9ba5860ea..433d140877 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.8 nozzle.json index 83cac78c49..d1f2d58e25 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "75x300" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.4 nozzle.json index 8d4683eeed..8bd346b1bb 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.4 nozzle.json @@ -24,62 +24,92 @@ "0x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,12 +123,15 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ @@ -106,12 +139,15 @@ "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.5 nozzle.json index cc30cfd0dc..11a65871b7 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.5 nozzle.json @@ -24,62 +24,92 @@ "0x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.25", "0.25" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.6 nozzle.json index e960f29742..0111ef8e99 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.6 nozzle.json @@ -24,62 +24,92 @@ "0x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.8 nozzle.json index 568f9ab12f..d3ec81c9c9 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 0.8 nozzle.json @@ -24,62 +24,92 @@ "0x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.4 nozzle.json index 8837dd0937..ff40588926 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.5 nozzle.json index be7c731a19..1590ca8b97 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.6 nozzle.json index f0af89ed75..70e56acda2 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.8 nozzle.json index 2079c3f39e..e56436666d 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.4 nozzle.json index 034fbc4477..ead084348a 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.5 nozzle.json index 2e5d00ff9f..a8b8e11c10 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.6 nozzle.json index 00c1a3d339..e003b9ff29 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.8 nozzle.json index 668450c706..4732e2874b 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "100x400" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.4 nozzle.json index e117439353..23fe24b867 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.4 nozzle.json @@ -24,62 +24,92 @@ "0x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,12 +123,15 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ @@ -106,12 +139,15 @@ "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.5 nozzle.json index 87096aa4e7..5cd0d2a7aa 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.5 nozzle.json @@ -24,62 +24,92 @@ "0x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.25", "0.25" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.6 nozzle.json index 61903d2dc6..f2beb5c4cd 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.6 nozzle.json @@ -24,62 +24,92 @@ "0x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.8 nozzle.json index 275241f8bf..1db28524d5 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 0.8 nozzle.json @@ -24,62 +24,92 @@ "0x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.3", "0.3" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.4 nozzle.json index 1ecc8bb035..53fe2527a3 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.5 nozzle.json index 08ca62e3bb..2ef06808bf 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.6 nozzle.json index 3f7c43607e..41687594a6 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.8 nozzle.json index ab1a259368..508b740eda 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_COPY\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.4 nozzle.json index f4d6d57d1b..33f40fbeb6 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.4 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.5 nozzle.json index 5c89275a42..e41b672612 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.5 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.6 nozzle.json index 1b8edc1400..f1f959b1c6 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.6 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.8 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.8 nozzle.json index 12ca6a0a2a..95d215cfb8 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.8 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE 0.8 nozzle.json @@ -24,62 +24,92 @@ "125x500" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "200", + "200", "200", "200" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "200", + "200", "200", "200" ], "machine_max_acceleration_e": [ + "5000", + "5000", "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_retracting": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_travel": [ + "20000", + "20000", "20000", "20000" ], "machine_max_jerk_x": [ + "5", + "5", "5", "5" ], "machine_max_jerk_y": [ + "5", + "5", "5", "5" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], @@ -93,24 +123,31 @@ "extruder_clearance_height_to_rod": "25", "extruder_clearance_height_to_lid": "140", "retract_lift_below": [ + "0.2", "0.2" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_speed": [ + "120", "120" ], "deretraction_speed": [ + "120", "120" ], "wipe": [ + "1", "1" ], "retract_before_wipe": [ + "70%", "70%" ], "z_hop": [ + "0.2", "0.2" ], "machine_start_gcode": "G28\nIDEX_MIRROR\nSTART_PRINT EXTRUDER_TEMP={first_layer_temperature[0]},{first_layer_temperature[1]} EXTRUDER_OTHER_LAYER_TEMP={temperature[0]},{temperature[1]} BED_TEMP=[first_layer_bed_temperature] INITIAL_TOOL={initial_tool} TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", diff --git a/resources/profiles/RolohaunDesign.json b/resources/profiles/RolohaunDesign.json index e0b7a33301..18eb9e4fc3 100644 --- a/resources/profiles/RolohaunDesign.json +++ b/resources/profiles/RolohaunDesign.json @@ -1,6 +1,6 @@ { "name": "RolohaunDesign", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "RolohaunDesign Printer Profiles", "machine_model_list": [ diff --git a/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit 0.4 nozzle.json b/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit 0.4 nozzle.json index f5c095918f..4637e5ad14 100644 --- a/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit 0.4 nozzle.json +++ b/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit 0.4 nozzle.json @@ -3,8 +3,8 @@ "name": "Rolohaun Delta Flyer Refit 0.4 nozzle", "inherits": "fdm_common_Rook MK1 LDO", "from": "system", - "instantiation": "true", "setting_id": "xRvK2POOU8rx7dLH", + "instantiation": "true", "bed_custom_model": "", "printer_structure": "delta", "deretraction_speed": [ diff --git a/resources/profiles/SecKit.json b/resources/profiles/SecKit.json index 91804bff0a..e4d4f91e80 100644 --- a/resources/profiles/SecKit.json +++ b/resources/profiles/SecKit.json @@ -1,6 +1,6 @@ { "name": "SecKit", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "SecKit configurations", "machine_model_list": [ diff --git a/resources/profiles/SecKit/filament/Generic ABS @SecKit.json b/resources/profiles/SecKit/filament/Generic ABS @SecKit.json index cdd9ce2f62..32db36b0fb 100644 --- a/resources/profiles/SecKit/filament/Generic ABS @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic ABS @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @SecKit", - "inherits": "fdm_filament_abs", "renamed_from": "SecKit Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "VSrXBQUNBQMwUc08", "filament_id": "OFY9muEs", diff --git a/resources/profiles/SecKit/filament/Generic ASA @SecKit.json b/resources/profiles/SecKit/filament/Generic ASA @SecKit.json index 366b20172b..7d48828374 100644 --- a/resources/profiles/SecKit/filament/Generic ASA @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic ASA @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @SecKit", - "inherits": "fdm_filament_asa", "renamed_from": "SecKit Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "usCYRq4VuLqXvb0T", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/SecKit/filament/Generic PA @SecKit.json b/resources/profiles/SecKit/filament/Generic PA @SecKit.json index 7746d8628a..0c3ac3a4c2 100644 --- a/resources/profiles/SecKit/filament/Generic PA @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PA @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @SecKit", - "inherits": "fdm_filament_pa", "renamed_from": "SecKit Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "uAuptETLwGxTsthC", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json b/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json index 52c0bae450..0833f7c993 100644 --- a/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @SecKit", - "inherits": "fdm_filament_pa", "renamed_from": "SecKit Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "P6G8DjjyfAFgGaj2", "filament_id": "OFQLcbps", diff --git a/resources/profiles/SecKit/filament/Generic PC @SecKit.json b/resources/profiles/SecKit/filament/Generic PC @SecKit.json index 689f3ea553..4d08959ca5 100644 --- a/resources/profiles/SecKit/filament/Generic PC @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PC @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @SecKit", - "inherits": "fdm_filament_pc", "renamed_from": "SecKit Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "PxmBHXsdhZGR9bYv", "filament_id": "OFLakOUI", diff --git a/resources/profiles/SecKit/filament/Generic PETG @SecKit.json b/resources/profiles/SecKit/filament/Generic PETG @SecKit.json index 05c5c753c6..2b2181c88d 100644 --- a/resources/profiles/SecKit/filament/Generic PETG @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PETG @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @SecKit", - "inherits": "fdm_filament_pet", "renamed_from": "SecKit Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "Qt4oXABB5Fukbz46", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/SecKit/filament/Generic PLA @SecKit.json b/resources/profiles/SecKit/filament/Generic PLA @SecKit.json index b3cd1c2ffc..7a87454000 100644 --- a/resources/profiles/SecKit/filament/Generic PLA @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PLA @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @SecKit", - "inherits": "fdm_filament_pla", "renamed_from": "SecKit Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "uWvI4RDQiYLFN7pp", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json b/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json index 507716caee..d68c13d36b 100644 --- a/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @SecKit", - "inherits": "fdm_filament_pla", "renamed_from": "SecKit Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "znagqvEsDcHYse9M", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/SecKit/filament/Generic PVA @SecKit.json b/resources/profiles/SecKit/filament/Generic PVA @SecKit.json index 13f7d50673..b149854c0e 100644 --- a/resources/profiles/SecKit/filament/Generic PVA @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic PVA @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @SecKit", - "inherits": "fdm_filament_pva", "renamed_from": "SecKit Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "DIUaGXpIF3fUfxqg", "filament_id": "OFDvXujf", diff --git a/resources/profiles/SecKit/filament/Generic TPU @SecKit.json b/resources/profiles/SecKit/filament/Generic TPU @SecKit.json index 96d9c38a60..d4e3952768 100644 --- a/resources/profiles/SecKit/filament/Generic TPU @SecKit.json +++ b/resources/profiles/SecKit/filament/Generic TPU @SecKit.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @SecKit", - "inherits": "fdm_filament_tpu", "renamed_from": "SecKit Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "agKm2K9w4ZOmZN8c", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/SeeMeCNC.json b/resources/profiles/SeeMeCNC.json index 21db5e4e3e..8bff5661ae 100644 --- a/resources/profiles/SeeMeCNC.json +++ b/resources/profiles/SeeMeCNC.json @@ -1,6 +1,6 @@ { "name": "SeeMeCNC", - "version": "2.4.0.05", + "version": "2.4.0.06", "force_update": "1", "description": "SeeMeCNC configurations - Full profile set for Artemis, BOSSdelta, and RostockMAX printers", "machine_model_list": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_4mm.json index 23ccc8cd08..6aabc9d4c3 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_5mm.json index f16bdf8620..9fb7eef8a8 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_7mm.json index 7bf1733799..f72a25c9cc 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_1_0mm.json index 68316ff085..098a6fcc49 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_Artemis_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_4mm.json index 4709989e11..d36eb598e8 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_5mm.json index a09599a118..b88111ae62 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_7mm.json index a045d6acb6..4c121f7906 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_1_0mm.json index 4fbdc6cdf0..06fdc03bd9 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0505_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_4mm.json index 1d40d2b7d8..d70145fc2a 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_5mm.json index f007e2c307..cf29664116 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_7mm.json index ae455b50bc..4e0388eacc 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_1_0mm.json index 28a865c33e..38d26bdf65 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0510_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_4mm.json index 6db1c32408..dd7e5b4e42 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_5mm.json index 0bba926946..727b56ffa1 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_7mm.json index 623edc7966..8eac323e8b 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_1_0mm.json index 9f1b324a3b..ecdda09652 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta500_0521_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_4mm.json index 51ca348ee2..7acf96a631 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_5mm.json index 78638f67ad..fe13b26823 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_7mm.json index d3d58505ed..3e898ebed7 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_1_0mm.json index c2ffdb20a0..f192d5c620 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_BOSSdelta_300_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_4mm.json index c53c7f7085..a883274039 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_5mm.json index 3e8b24699f..f9ae2d5ceb 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_7mm.json index d1fd58da56..e3f08f903f 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_1_0mm.json index 648c797d61..d8131eab5b 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v3.2_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_4mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_4mm.json index 39252fa29e..86febcf52a 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_4mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_4mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_5mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_5mm.json index f1dbfc5e2f..1ca829f83c 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_5mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_5mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_7mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_7mm.json index c7bce4faca..2a9320d542 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_7mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_0_7mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_1_0mm.json b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_1_0mm.json index f1ec174cf2..6213c30b3a 100644 --- a/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_1_0mm.json +++ b/resources/profiles/SeeMeCNC/machine/SeeMeCNC_RostockMAX_v4_1_0mm.json @@ -120,6 +120,7 @@ "15" ], "machine_max_junction_deviation": [ + "0.01", "0.01" ], "machine_max_speed_e": [ diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index 06acef0b0e..d13ed8bf21 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.15", + "version": "02.04.00.16", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ 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 index 44125a8381..79305ab57e 100644 --- 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 @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyLite Dual PLA @0.2 nozzle", "inherits": "PolyLite PLA @0.2 nozzle", - "filament_id": "OFYGbPHX", "from": "system", "setting_id": "jhmy4YHi9MuL0DWu", + "filament_id": "OFYGbPHX", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.2 nozzle)", 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 index 8e4075ccf7..f826452d55 100644 --- 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 @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyLite J1 PLA @0.2 nozzle", "inherits": "PolyLite PLA @0.2 nozzle", - "filament_id": "OF7SliVn", "from": "system", "setting_id": "jFlRSxx0KvN3BOUu", + "filament_id": "OF7SliVn", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.2 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json index 0bbce7eec8..14a97da12f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyLite J1 PLA", "inherits": "PolyLite PLA @base", - "filament_id": "OF7SliVn", "from": "system", "setting_id": "wcpOTTMyZNPFKyXr", + "filament_id": "OF7SliVn", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", 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 index 1f28bcfac6..b8796ad051 100644 --- 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 @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyTerra Dual PLA @0.2 nozzle", "inherits": "PolyTerra PLA @0.2 nozzle", - "filament_id": "OFCccVrQ", "from": "system", "setting_id": "UQYgjH1uVxf3d2Nv", + "filament_id": "OFCccVrQ", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.2 nozzle)", 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 index 6e424a84d3..4493bd50f6 100644 --- 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 @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyTerra J1 PLA @0.2 nozzle", "inherits": "PolyTerra PLA @0.2 nozzle", - "filament_id": "OF43Raws", "from": "system", "setting_id": "mxKHxGmBZzPLS82O", + "filament_id": "OF43Raws", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.2 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json index 55fb74f4f7..58e6989223 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json @@ -2,9 +2,9 @@ "type": "filament", "name": "PolyTerra J1 PLA", "inherits": "PolyTerra PLA @base", - "filament_id": "OF43Raws", "from": "system", "setting_id": "4MZWZX7QPBzxdEGj", + "filament_id": "OF43Raws", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json index f1c3aa30a1..9d9e3918cf 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json @@ -5,20 +5,19 @@ "from": "system", "setting_id": "Ujul2YTBwfldFiFd", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ - "1", "1" ], "filament_ramming_travel_time": [ - "0", "0" ], "long_retractions_when_ec": [ - "0", "0" ], "retraction_distances_when_ec": [ - "0", "0" ], "compatible_printers": [ diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json index 66a535b7fb..985505a027 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json @@ -5,16 +5,16 @@ "from": "system", "setting_id": "2FfQZdp5xunngnF0", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_ramming_travel_time": [ - "0", "0" ], "long_retractions_when_ec": [ - "0", "0" ], "retraction_distances_when_ec": [ - "0", "0" ], "compatible_printers": [ diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json index 04446a623e..83c1b17971 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json @@ -5,16 +5,16 @@ "from": "system", "setting_id": "ebANa67V4B2nwUaX", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_ramming_travel_time": [ - "0", "0" ], "long_retractions_when_ec": [ - "0", "0" ], "retraction_distances_when_ec": [ - "0", "0" ], "compatible_printers": [ diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json index 9ce38a9782..357c5de50a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Snapmaker PLA-CF @U1 0.4 nozzle", + "renamed_from": "Snapmaker PLA-CF @U1", "inherits": "fdm_filament_pla", "from": "system", - "renamed_from": "Snapmaker PLA-CF @U1", "setting_id": "2INwruC3ZVkBTdUT", "filament_id": "OFhQf8ou", "instantiation": "true", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json index 183e125c73..674b82930c 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json @@ -36,14 +36,32 @@ ], "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", "30", "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", "20", "12" ], @@ -67,7 +85,12 @@ "0.2", "0.2" ], - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], "printable_area": [ "0.5x1", "270.5x1", @@ -185,7 +208,12 @@ "machine_unload_filament_time": "0", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME\nDEFECT_DETECTION_DETECT", "machine_pause_gcode": "M600", - "nozzle_volume": "143", + "nozzle_volume": [ + "143", + "143", + "143", + "143" + ], "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "default_print_profile": "0.10 Standard @Snapmaker U1 (0.2 nozzle)" } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json index 6d2ec2cfe6..3acd21c2dd 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json @@ -36,14 +36,32 @@ ], "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", "30", "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", "20", "12" ], @@ -67,7 +85,12 @@ "0.4", "0.4" ], - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], "printable_area": [ "0.5x1", "270.5x1", @@ -187,7 +210,12 @@ "default_print_profile": "0.20 Standard @Snapmaker U1 (0.4 nozzle)", "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", - "nozzle_volume": "143", + "nozzle_volume": [ + "143", + "143", + "143", + "143" + ], "resonance_avoidance": "1", "min_resonance_avoidance_speed": "40", "max_resonance_avoidance_speed": "90" diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json index c9866329bd..cc4e7a0515 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json @@ -26,5 +26,10 @@ "0.6", "0.6" ], - "nozzle_type": "stainless_steel" + "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel" + ] } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json index a6cb0d0bd3..98b6f7e683 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json @@ -36,14 +36,32 @@ ], "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", "30", "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", "20", "12" ], @@ -67,7 +85,12 @@ "0.6", "0.6" ], - "nozzle_type": "stainless_steel", + "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel" + ], "printable_area": [ "0.5x1", "270.5x1", @@ -186,6 +209,11 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME\nDEFECT_DETECTION_DETECT", "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", - "nozzle_volume": "143", + "nozzle_volume": [ + "143", + "143", + "143", + "143" + ], "default_print_profile": "0.30 Standard @Snapmaker U1 (0.6 nozzle)" } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json index ef4da1a516..6ab566e0aa 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json @@ -36,14 +36,32 @@ ], "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", "30", "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", "20", "12" ], @@ -67,7 +85,12 @@ "0.8", "0.8" ], - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel" + ], "printable_area": [ "0.5x1", "270.5x1", @@ -186,6 +209,11 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME\nDEFECT_DETECTION_DETECT", "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", - "nozzle_volume": "143", + "nozzle_volume": [ + "143", + "143", + "143", + "143" + ], "default_print_profile": "0.40 Standard @Snapmaker U1 (0.8 nozzle)" } diff --git a/resources/profiles/Sovol.json b/resources/profiles/Sovol.json index 81dab20239..1b30ae4143 100644 --- a/resources/profiles/Sovol.json +++ b/resources/profiles/Sovol.json @@ -1,7 +1,7 @@ { "name": "Sovol", "url": "", - "version": "02.04.00.07", + "version": "02.04.00.08", "force_update": "0", "description": "Sovol configurations", "machine_model_list": [ diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json index 49b26d498a..67e7edc5b0 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic ABS @Sovol SV06 ACE", - "inherits": "Generic ABS @System", "renamed_from": "Sovol SV06 ACE ABS", + "inherits": "Generic ABS @System", "from": "system", "setting_id": "exjBdPPCgk53gipu", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json index 905ee2bda0..2ea4473855 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic ABS @Sovol SV06 Plus ACE", - "inherits": "Generic ABS @System", "renamed_from": "Sovol SV06 Plus ACE ABS", + "inherits": "Generic ABS @System", "from": "system", "setting_id": "sg9HXvKEoKD4pw7v", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json index 8532e5bee0..5c5e0353dd 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json @@ -1,10 +1,13 @@ { "type": "filament", - "setting_id": "7julgReKEcp5tg0d", "name": "Generic ABS @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic ABS @System", + "from": "system", + "setting_id": "7julgReKEcp5tg0d", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json index e690ee88e5..204288affc 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic ABS @Sovol SV08", - "inherits": "Generic ABS @System", "renamed_from": "Sovol SV08 ABS", + "inherits": "Generic ABS @System", "from": "system", "setting_id": "aZx3ePr3Id1jPJG9", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json index 242c320a7d..4df49482b1 100644 --- a/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json @@ -1,10 +1,13 @@ { "type": "filament", - "setting_id": "UPoqjanrvN173sVS", "name": "Generic PC @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PC @System", + "from": "system", + "setting_id": "UPoqjanrvN173sVS", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json index 832deb1368..ad8e26864c 100644 --- a/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFLakOUI", - "setting_id": "yRKCiPMN6fxibcyg", "name": "Generic PC @Sovol Zero", "renamed_from": "Sovol Zero PC", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "yRKCiPMN6fxibcyg", + "filament_id": "OFLakOUI", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json index acb2c90316..31097dc51f 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PETG @Sovol SV06 ACE", - "inherits": "Generic PETG @System", "renamed_from": "Sovol SV06 ACE PETG", + "inherits": "Generic PETG @System", "from": "system", "setting_id": "p8fGWNVkT6n5Dv9P", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json index 5c2dfeff98..11188b88a4 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PETG @Sovol SV06 Plus ACE", - "inherits": "Generic PETG @System", "renamed_from": "Sovol SV06 Plus ACE PETG", + "inherits": "Generic PETG @System", "from": "system", "setting_id": "I7IzLMYw7iDUUJwc", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json index 550d30ccf5..08de72fcce 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json @@ -1,10 +1,13 @@ { "type": "filament", - "setting_id": "ib7AtR3tQ2dSrFNP", "name": "Generic PETG @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "ib7AtR3tQ2dSrFNP", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json index c637897b10..4e9335e97b 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PETG @Sovol SV08", - "inherits": "Generic PETG @System", "renamed_from": "Sovol SV08 PETG", + "inherits": "Generic PETG @System", "from": "system", "setting_id": "7vDZKIKJW5fy1EGG", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json index ef6a6324e3..1ea9ae00e6 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFYPdQJh", - "setting_id": "d9QbCESNz3ZLU6eu", "name": "Generic PETG @Sovol Zero Hardened Steel nozzle", "renamed_from": "Sovol Zero PETG HS Nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "d9QbCESNz3ZLU6eu", + "filament_id": "OFYPdQJh", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json index b9632637ad..5972184f6c 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFYPdQJh", - "setting_id": "i4OW2eAtXOKdtVNj", "name": "Generic PETG @Sovol Zero", "renamed_from": "Sovol Zero PETG", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "i4OW2eAtXOKdtVNj", + "filament_id": "OFYPdQJh", + "instantiation": "true", "filament_flow_ratio": [ "1.0348" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json index de9e7cde47..41751ee0ad 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA @Sovol SV06 ACE", - "inherits": "Generic PLA @System", "renamed_from": "Sovol SV06 ACE PLA", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "UEEwpetmmxpxM4vV", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json index 8dcb4a6d2d..8b08b7ad57 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA @Sovol SV06 Plus ACE", - "inherits": "Generic PLA @System", "renamed_from": "Sovol SV06 Plus ACE PLA", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "yzv5Kwe3OivHxNUI", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json index 42210ef9c0..934a9efe2d 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA @Sovol SV07", - "inherits": "Generic PLA @System", "renamed_from": "Sovol SV07 PLA", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "sNGno8XCSsgmwjvH", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json index be23b183ab..4a28282063 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA @Sovol SV08 0.2 nozzle", - "inherits": "Generic PLA @System", "renamed_from": "Sovol SV08 PLA @SV08 0.2 nozzle;Sovol SV08 PLA SV08 0.2 nozzle", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "W7oQNGWqiPMUlzhw", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json index b29bc1b069..d0428319af 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json @@ -1,10 +1,13 @@ { "type": "filament", - "setting_id": "kcFykpuuxMy7KwNu", "name": "Generic PLA @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "kcFykpuuxMy7KwNu", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json index c124edee31..12668251e9 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PLA @Sovol SV08", - "inherits": "Generic PLA @System", "renamed_from": "Sovol SV08 PLA", + "inherits": "Generic PLA @System", "from": "system", "setting_id": "4fSYcvbFXNRHnlEw", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json index bba0cbfb51..776452aed8 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFDSrzZ8", - "setting_id": "nZgETe4CTpicEjQX", "name": "Generic PLA @Sovol Zero Hardened Steel nozzle", "renamed_from": "Sovol Zero PLA Basic HS Nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "nZgETe4CTpicEjQX", + "filament_id": "OFDSrzZ8", + "instantiation": "true", "filament_flow_ratio": [ "1.0348" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json index c8424af4f4..e3f4b92ac9 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFDSrzZ8", - "setting_id": "NNDerIjh7qtuh1I3", "name": "Generic PLA @Sovol Zero", "renamed_from": "Sovol Zero PLA Basic", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "NNDerIjh7qtuh1I3", + "filament_id": "OFDSrzZ8", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json index a9aefc6bd2..c55bf2516d 100644 --- a/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFIUkWYN", - "setting_id": "MC2InZ7iKDjIGike", "name": "Generic PLA SPEEDBENCHY @Sovol Zero", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "MC2InZ7iKDjIGike", + "filament_id": "OFIUkWYN", + "instantiation": "true", "filament_flow_ratio": [ "1" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json index ac456a82ee..f3e1e1cd82 100644 --- a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json @@ -1,11 +1,14 @@ { "type": "filament", - "filament_id": "OFesA6rF", - "setting_id": "WAHQZmwHoS4WjoTx", "name": "Generic PLA Silk @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "WAHQZmwHoS4WjoTx", + "filament_id": "OFesA6rF", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json index 7347fa08de..52ecbd08de 100644 --- a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFesA6rF", - "setting_id": "LA8X1RsMdV2xNT1o", "name": "Generic PLA Silk @Sovol Zero Hardened Steel nozzle", "renamed_from": "Sovol Zero PLA Silk HS Nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "LA8X1RsMdV2xNT1o", + "filament_id": "OFesA6rF", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json index 6c9c27a00a..ecbebcfc40 100644 --- a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFesA6rF", - "setting_id": "Se2yKerHRStYtWf5", "name": "Generic PLA Silk @Sovol Zero", "renamed_from": "Sovol Zero PLA Silk", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "Se2yKerHRStYtWf5", + "filament_id": "OFesA6rF", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json index ba653af37d..e588e91bc2 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic TPU @Sovol SV06 ACE", - "inherits": "Generic TPU @System", "renamed_from": "Sovol SV06 ACE TPU", + "inherits": "Generic TPU @System", "from": "system", "setting_id": "jBAo7stLaaQxKFsp", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json index 9c9490b863..311724601e 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic TPU @Sovol SV06 Plus ACE", - "inherits": "Generic TPU @System", "renamed_from": "Sovol SV06 Plus ACE TPU", + "inherits": "Generic TPU @System", "from": "system", "setting_id": "MUXz0JSHdT66Mti1", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json index a65978a50e..fd3891ff9c 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json @@ -1,10 +1,13 @@ { "type": "filament", - "setting_id": "hQByQ7FIhAiytli8", "name": "Generic TPU @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "hQByQ7FIhAiytli8", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json index bf412d77d8..d8cbcf07b7 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic TPU @Sovol SV08", - "inherits": "Generic TPU @System", "renamed_from": "Sovol SV08 TPU", + "inherits": "Generic TPU @System", "from": "system", "setting_id": "vFPYMoNvgjn1aSKA", "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json index 8624043cf9..fb21ee721b 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFgbpcy9", - "setting_id": "MlY6WQ41FE8zDPSV", "name": "Generic TPU @Sovol Zero", "renamed_from": "Sovol Zero TPU", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "MlY6WQ41FE8zDPSV", + "filament_id": "OFgbpcy9", + "instantiation": "true", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json index f56ca13525..f45ddf38f5 100644 --- a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json @@ -1,11 +1,14 @@ { "type": "filament", - "filament_id": "OF6H51Xx", - "setting_id": "JBFKMaFtd7kO8Ksq", "name": "Polymaker PETG @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "JBFKMaFtd7kO8Ksq", + "filament_id": "OF6H51Xx", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "Polymaker" ], diff --git a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json index 1ff8f57fac..6512adc3b8 100644 --- a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json @@ -1,11 +1,14 @@ { "type": "filament", - "filament_id": "OF2GCW1l", - "setting_id": "x68SPQCqVacBSGd5", "name": "SUNLU PETG @Sovol SV08 MAX", - "from": "system", - "instantiation": "true", "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "x68SPQCqVacBSGd5", + "filament_id": "OF2GCW1l", + "instantiation": "true", + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_vendor": [ "SUNLU" ], diff --git a/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json index fe6d0dcd96..234b872dc3 100644 --- a/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "OrYBz2bwPIXQ0QZa", "name": "Sovol SV01 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "OrYBz2bwPIXQ0QZa", + "instantiation": "true", "printer_model": "Sovol SV01", "default_print_profile": "0.20mm Standard @Sovol SV01", "nozzle_diameter": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV02 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV02 0.4 nozzle.json index 65f382b90e..50197d701e 100644 --- a/resources/profiles/Sovol/machine/Sovol SV02 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV02 0.4 nozzle.json @@ -26,65 +26,98 @@ "0x240" ], "printable_height": "300", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ + "500", + "500", "500", "500" ], "machine_max_acceleration_retracting": [ + "1000", + "1000", "1000", "1000" ], "machine_max_acceleration_travel": [ + "1500", + "1250", "1500", "1250" ], "machine_max_acceleration_x": [ + "500", + "500", "500", "500" ], "machine_max_acceleration_y": [ + "500", + "500", "500", "500" ], "machine_max_acceleration_z": [ + "100", + "100", "100", "100" ], "machine_max_speed_e": [ + "60", + "60", "60", "60" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "10", + "10", "10", "10" ], "machine_max_jerk_e": [ + "5", + "5", "5", "5" ], "machine_max_jerk_x": [ + "8", + "8", "8", "8" ], "machine_max_jerk_y": [ + "8", + "8", "8", "8" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], "machine_max_junction_deviation": [ + "0.06", + "0", "0.06", "0" ], diff --git a/resources/profiles/Sovol/machine/Sovol SV06 0.4 High-Speed nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 0.4 High-Speed nozzle.json index 32726c753f..90d6ceb677 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 0.4 High-Speed nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 0.4 High-Speed nozzle.json @@ -69,7 +69,6 @@ "10" ], "z_hop": [ - "0.4", "0.4" ], "max_layer_height": [ @@ -77,35 +76,34 @@ "0.32" ], "retract_lift_below": [ - "248", "248" ], "retraction_speed": [ - "35", "35" ], "deretraction_speed": [ - "35", "35" ], "wipe_distance": [ - "2", "2" ], "retract_length_toolchange": [ - "1", "1" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.4", "0.4" ], "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0", diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.2 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.2 nozzle.json index 329a91b001..da36449a58 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.2 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.2 nozzle.json @@ -85,15 +85,12 @@ "0.16" ], "retract_lift_below": [ - "248", "248" ], "retraction_speed": [ - "35", "35" ], "deretraction_speed": [ - "35", "35" ], "wipe_distance": [ @@ -103,19 +100,22 @@ "100%" ], "retract_length_toolchange": [ - "2", "2" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "gcode_flavor": "klipper", diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.4 nozzle.json index c9f054af98..7cb3e5e232 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.4 nozzle.json @@ -85,15 +85,12 @@ "0.32" ], "retract_lift_below": [ - "248", "248" ], "retraction_speed": [ - "40", "40" ], "deretraction_speed": [ - "40", "40" ], "wipe_distance": [ @@ -103,19 +100,22 @@ "100%" ], "retract_length_toolchange": [ - "2", "2" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "gcode_flavor": "klipper", diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.6 nozzle.json index e7bc84ee1a..53068f8999 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.6 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.6 nozzle.json @@ -85,15 +85,12 @@ "0.48" ], "retract_lift_below": [ - "248", "248" ], "retraction_speed": [ - "45", "45" ], "deretraction_speed": [ - "45", "45" ], "wipe_distance": [ @@ -103,19 +100,22 @@ "100%" ], "retract_length_toolchange": [ - "2", "2" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "gcode_flavor": "klipper", diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.8 nozzle.json index 6c555ef1d5..49c6077ee8 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.8 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE 0.8 nozzle.json @@ -85,15 +85,12 @@ "0.64" ], "retract_lift_below": [ - "248", "248" ], "retraction_speed": [ - "45", "45" ], "deretraction_speed": [ - "45", "45" ], "wipe_distance": [ @@ -103,19 +100,22 @@ "100%" ], "retract_length_toolchange": [ - "2", "2" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "gcode_flavor": "klipper", diff --git a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE 0.4 nozzle.json index 5624a3c07f..80053de960 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE 0.4 nozzle.json @@ -83,15 +83,12 @@ "0.32" ], "retract_lift_below": [ - "343", "343" ], "retraction_speed": [ - "40", "40" ], "deretraction_speed": [ - "40", "40" ], "wipe_distance": [ @@ -101,19 +98,22 @@ "100%" ], "retract_length_toolchange": [ - "2", "2" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "gcode_flavor": "klipper", diff --git a/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json index 513c7a3bca..dc8d999f2e 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json @@ -25,45 +25,59 @@ "0.8" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_x": [ + "12000", "12000" ], "machine_max_acceleration_y": [ + "12000", "12000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_jerk_x": [ + "9", "9" ], "machine_max_jerk_y": [ + "9", "9" ], "machine_max_jerk_z": [ + "0.25", "0.25" ], "machine_max_jerk_e": [ + "3", "3" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json index ef7b6f4986..7981ef6055 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json @@ -20,6 +20,7 @@ "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json index 441616c542..c28b90b27f 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json @@ -32,48 +32,63 @@ "0.5" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "700", "700" ], "machine_max_speed_y": [ + "700", "700" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json index 7defca131b..8997656a21 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json @@ -26,48 +26,63 @@ "0.5" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "700", "700" ], "machine_max_speed_y": [ + "700", "700" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json index d49594b4af..1cdf784b99 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json @@ -32,48 +32,63 @@ "0.5" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "700", "700" ], "machine_max_speed_y": [ + "700", "700" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json index 576ca16076..e79d65fb55 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json @@ -32,48 +32,63 @@ "0.5" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "700", "700" ], "machine_max_speed_y": [ + "700", "700" ], "machine_max_speed_z": [ + "20", "20" ], "machine_max_acceleration_e": [ + "5000", "5000" ], "machine_max_acceleration_extruding": [ + "20000", "20000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json index d71e6b448b..4c90815729 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "MIHp3VCfT1e6gMjs", "name": "Sovol SV08 MAX 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "MIHp3VCfT1e6gMjs", + "instantiation": "true", "printer_model": "Sovol SV08 MAX", "default_print_profile": "0.20mm Standard @Sovol SV08 MAX 0.4 nozzle", "printer_variant": "0.4", @@ -27,48 +27,63 @@ "0.8" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "800", "800" ], "machine_max_speed_y": [ + "800", "800" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "2.5", "2.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json index 4972eee589..53e2873472 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "HR1xTYrAmc07KHs0", "name": "Sovol SV08 MAX 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "HR1xTYrAmc07KHs0", + "instantiation": "true", "printer_model": "Sovol SV08 MAX", "default_print_profile": "0.30mm Standard @Sovol SV08 MAX 0.6 nozzle", "printer_variant": "0.6", @@ -36,48 +36,63 @@ "0.1" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "800", "800" ], "machine_max_speed_y": [ + "800", "800" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "2.5", "2.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json index 32511e52ca..764eb801d2 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "8WhF31wX3mBoOqpx", "name": "Sovol SV08 MAX 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "8WhF31wX3mBoOqpx", + "instantiation": "true", "printer_model": "Sovol SV08 MAX", "default_print_profile": "0.40mm Standard @Sovol SV08 MAX 0.8 nozzle", "printer_variant": "0.8", @@ -36,48 +36,63 @@ "0.1" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "800", "800" ], "machine_max_speed_y": [ + "800", "800" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "20", "20" ], "machine_max_jerk_y": [ + "20", "20" ], "machine_max_jerk_z": [ + "2.5", "2.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json index 33fb16508a..8b31824f86 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "MAF2n6b8uoY92qVH", "name": "Sovol Zero 0.2 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "MAF2n6b8uoY92qVH", + "instantiation": "true", "printer_model": "Sovol Zero", "default_print_profile": "0.10mm Standard @Sovol Zero 0.2 nozzle", "printer_variant": "0.2", @@ -32,48 +32,63 @@ "1.8" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "30", "30" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json index 932c5b9121..5ff3a25bb5 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "QclEa2nmpBiii6Y0", "name": "Sovol Zero 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "QclEa2nmpBiii6Y0", + "instantiation": "true", "printer_model": "Sovol Zero", "default_print_profile": "0.20mm Standard @Sovol Zero 0.4 nozzle", "printer_variant": "0.4", @@ -32,48 +32,63 @@ "1.8" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "30", "30" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json index e2cfc7ccc5..6fe78791d5 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "BlngL0WExXTeyrXg", "name": "Sovol Zero 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "BlngL0WExXTeyrXg", + "instantiation": "true", "printer_model": "Sovol Zero", "default_print_profile": "0.30mm Standard @Sovol Zero 0.6 nozzle", "printer_variant": "0.6", @@ -32,48 +32,63 @@ "3.0" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "30", "30" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json index bc67a64ce5..5fb9f267c7 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "DDpJMY1A2r4k1Cho", "name": "Sovol Zero 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "DDpJMY1A2r4k1Cho", + "instantiation": "true", "printer_model": "Sovol Zero", "default_print_profile": "0.40mm Standard @Sovol Zero 0.8 nozzle", "printer_variant": "0.8", @@ -32,48 +32,63 @@ "3.0" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "30", "30" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json index beb6db80bd..fd87dafdaf 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "CGunT3KHnCqEAlrN", "name": "Sovol Zero 1.0 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "CGunT3KHnCqEAlrN", + "instantiation": "true", "printer_model": "Sovol Zero", "default_print_profile": "0.50mm Standard @Sovol Zero 1.0 nozzle", "printer_variant": "1.0", @@ -32,48 +32,63 @@ "3.0" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "1200", "1200" ], "machine_max_speed_y": [ + "1200", "1200" ], "machine_max_speed_z": [ + "30", "30" ], "machine_max_acceleration_e": [ + "20000", "20000" ], "machine_max_acceleration_extruding": [ + "40000", "40000" ], "machine_max_acceleration_retracting": [ + "20000", "20000" ], "machine_max_acceleration_travel": [ + "40000", "40000" ], "machine_max_acceleration_x": [ + "40000", "40000" ], "machine_max_acceleration_y": [ + "40000", "40000" ], "machine_max_acceleration_z": [ + "1000", "1000" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "5", "5" ], "machine_max_jerk_y": [ + "5", "5" ], "machine_max_jerk_z": [ + "0.5", "0.5" ], "z_hop": [ diff --git a/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json index c1cc06a737..642c136c55 100644 --- a/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "CaEopiv2Wg6pQJjH", "name": "0.12mm Quality @Sovol Zero 0.4 nozzle", - "from": "system", "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "CaEopiv2Wg6pQJjH", "instantiation": "true", "layer_height": "0.12", "bottom_shell_layers": "8", diff --git a/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json index f532985258..75b3e3bc9f 100644 --- a/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json +++ b/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "IfDpa3vM99D4ytny", "name": "0.15mm Quality @Sovol Zero 0.6 nozzle", - "from": "system", "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "IfDpa3vM99D4ytny", "instantiation": "true", "layer_height": "0.15", "bottom_shell_layers": "5", diff --git a/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json index d8820163d6..0e05d5c232 100644 --- a/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ShJTVnJ492No1j2j", "name": "0.20mm Standard @Sovol Zero 0.4 nozzle", - "from": "system", "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "ShJTVnJ492No1j2j", "instantiation": "true", "layer_height": "0.20", "bottom_shell_layers": "4", diff --git a/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json index 89e248b223..ade76267af 100644 --- a/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "oFrWcSxmad1b6sD4", "name": "0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle", - "from": "system", "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "oFrWcSxmad1b6sD4", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json index 4f1f487bdf..930c0c14b0 100644 --- a/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json +++ b/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "lTAs2USEP8D749K7", "name": "0.30mm Standard @Sovol Zero 0.6 nozzle", - "from": "system", "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "lTAs2USEP8D749K7", "instantiation": "true", "layer_height": "0.30", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime.json b/resources/profiles/Tiertime.json index a7efecf420..a48691dd23 100644 --- a/resources/profiles/Tiertime.json +++ b/resources/profiles/Tiertime.json @@ -1,6 +1,6 @@ { "name": "Tiertime", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Tiertime configurations", "machine_model_list": [ diff --git a/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json index e9d7aca6fc..d668d84e4e 100644 --- a/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Tiertime 300HS", - "inherits": "fdm_filament_abs", "renamed_from": "Tiertime Generic ABS@300HS;Tiertime Generic ABS300HS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "CDku986CRCZQpwu4", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json index 7e8f606a6e..31fd71a17a 100644 --- a/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Tiertime", - "inherits": "fdm_filament_abs", "renamed_from": "Tiertime Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "mDRlI9biZBn9sNlS", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json index adffa21725..8187f650a3 100644 --- a/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Tiertime 300HS", - "inherits": "fdm_filament_asa", "renamed_from": "Tiertime Generic ASA@300HS;Tiertime Generic ASA300HS", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "HLh2XxQuVOa86efy", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json index 1529e0f702..b49082c269 100644 --- a/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Tiertime", - "inherits": "fdm_filament_asa", "renamed_from": "Tiertime Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "kGrTR0sC37w9Qi3b", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json index 9db52386cb..40024ebb71 100644 --- a/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic BVOH @Tiertime 300HS", - "inherits": "fdm_filament_bvoh", "renamed_from": "Tiertime Generic BVOH@300HS;Tiertime Generic BVOH300HS", + "inherits": "fdm_filament_bvoh", "from": "system", "setting_id": "aCtg07TUbh6I9XPo", "filament_id": "OFo2UF2C", diff --git a/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json index fd6e2a529f..0e8188e36e 100644 --- a/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic BVOH @Tiertime", - "inherits": "fdm_filament_bvoh", "renamed_from": "Tiertime Generic BVOH", + "inherits": "fdm_filament_bvoh", "from": "system", "setting_id": "b642QISGuDZ18fQ8", "filament_id": "OFo2UF2C", diff --git a/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json index f066563e4c..22bfc30c35 100644 --- a/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic EVA @Tiertime 300HS", - "inherits": "fdm_filament_eva", "renamed_from": "Tiertime Generic EVA@300HS;Tiertime Generic EVA300HS", + "inherits": "fdm_filament_eva", "from": "system", "setting_id": "q5f3UKuj7KOtiNkH", "filament_id": "OFCD8qiU", diff --git a/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json index ec49722cae..e5fdbfa8a4 100644 --- a/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic EVA @Tiertime", - "inherits": "fdm_filament_eva", "renamed_from": "Tiertime Generic EVA", + "inherits": "fdm_filament_eva", "from": "system", "setting_id": "NTY4MeZtxt16HNAV", "filament_id": "OFCD8qiU", diff --git a/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json index 8eaa300930..6b624d8c67 100644 --- a/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic HIPS @Tiertime 300HS", - "inherits": "fdm_filament_hips", "renamed_from": "Tiertime Generic HIPS@300HS;Tiertime Generic HIPS300HS", + "inherits": "fdm_filament_hips", "from": "system", "setting_id": "ee157A7VEkDzMh61", "filament_id": "OFsFon5l", diff --git a/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json index 519e690ed6..f53f9155e6 100644 --- a/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic HIPS @Tiertime", - "inherits": "fdm_filament_hips", "renamed_from": "Tiertime Generic HIPS", + "inherits": "fdm_filament_hips", "from": "system", "setting_id": "3Vm99hmTMTFPKNGk", "filament_id": "OFsFon5l", diff --git a/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json index 3c97aa11a7..39aa5ad463 100644 --- a/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic PA @Tiertime 300HS", - "inherits": "fdm_filament_pa", "renamed_from": "Tiertime Generic PA@300HS;Tiertime Generic PA300HS", + "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFg8ndtj", "setting_id": "yGD1puWjH2QFacXJ", + "filament_id": "OFg8ndtj", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json index 1ff338b317..4a73b6c27d 100644 --- a/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic PA @Tiertime", - "inherits": "fdm_filament_pa", "renamed_from": "Tiertime Generic PA", + "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFg8ndtj", "setting_id": "u37BwUzY2vt6zqjd", + "filament_id": "OFg8ndtj", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json index 3feade702d..d6981a6ecf 100644 --- a/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic PA-CF @Tiertime 300HS", - "inherits": "fdm_filament_pa", "renamed_from": "Tiertime Generic PA-CF@300HS;Tiertime Generic PA-CF300HS", + "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFQLcbps", "setting_id": "nZprcLHiLIAKvqtu", + "filament_id": "OFQLcbps", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json index fe57cb7806..c1c6963425 100644 --- a/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic PA-CF @Tiertime", - "inherits": "fdm_filament_pa", "renamed_from": "Tiertime Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFQLcbps", "setting_id": "1oq9XQtCUcV9wGYV", + "filament_id": "OFQLcbps", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json index 591d1c9208..b2d1961c4e 100644 --- a/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Tiertime 300HS", - "inherits": "fdm_filament_pc", "renamed_from": "Tiertime Generic PC@300HS;Tiertime Generic PC300HS", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "cqm5YuWHhzXdvE0M", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json index 8c36c18828..af1160e509 100644 --- a/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Tiertime", - "inherits": "fdm_filament_pc", "renamed_from": "Tiertime Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "ILOqHUkf5W9fcRic", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json index 25eb1b1b76..0c82dafed0 100644 --- a/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PCTG @Tiertime 300HS", - "inherits": "fdm_filament_pctg", "renamed_from": "Tiertime Generic PCTG@300HS;Tiertime Generic PCTG300HS", + "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "1VNFGuUO3KSO6Yfr", "filament_id": "OFu1evlr", diff --git a/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json index 4d091cde32..d0945c92ba 100644 --- a/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PCTG @Tiertime", - "inherits": "fdm_filament_pctg", "renamed_from": "Tiertime Generic PCTG", + "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "tJIMGMxg0hRSfL95", "filament_id": "OFu1evlr", diff --git a/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json index a1fa9c5859..4743e2dd64 100644 --- a/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PE @Tiertime 300HS", - "inherits": "fdm_filament_pe", "renamed_from": "Tiertime Generic PE@300HS;Tiertime Generic PE300HS", + "inherits": "fdm_filament_pe", "from": "system", "setting_id": "CO9KWZrfkTYBnB4X", "filament_id": "OFPklMI1", diff --git a/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json index 0684af67d8..4e96edfc00 100644 --- a/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PE @Tiertime", - "inherits": "fdm_filament_pe", "renamed_from": "Tiertime Generic PE", + "inherits": "fdm_filament_pe", "from": "system", "setting_id": "2U06Qrlxin8nLr9s", "filament_id": "OFPklMI1", diff --git a/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json index 11a6680550..59c94fe9c2 100644 --- a/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PE-CF @Tiertime 300HS", - "inherits": "fdm_filament_pe", "renamed_from": "Tiertime Generic PE-CF@300HS;Tiertime Generic PE-CF300HS", + "inherits": "fdm_filament_pe", "from": "system", "setting_id": "512vfRIxs8uwOBpP", "filament_id": "OFd0Fv0k", diff --git a/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json index ecc5a74d8c..6f2fd9fb2e 100644 --- a/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PE-CF @Tiertime", - "inherits": "fdm_filament_pe", "renamed_from": "Tiertime Generic PE-CF", + "inherits": "fdm_filament_pe", "from": "system", "setting_id": "QWIMNxCCZ9URxMjo", "filament_id": "OFd0Fv0k", diff --git a/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json index e65d53bc71..2eb489ac68 100644 --- a/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Tiertime 300HS", - "inherits": "fdm_filament_pet", "renamed_from": "Tiertime Generic PETG@300HS;Tiertime Generic PETG300HS", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "btlSAAZFdFgnfIqh", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json index cdf4a2ba88..2fe87a8ce8 100644 --- a/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Tiertime", - "inherits": "fdm_filament_pet", "renamed_from": "Tiertime Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "JwdH78YQ3v5XxsIq", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json index 2193ee85fe..f10abb4950 100644 --- a/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Tiertime 300HS", - "inherits": "fdm_filament_pet", "renamed_from": "Tiertime Generic PETG-CF@300HS;Tiertime Generic PETG-CF300HS", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "pnBek08LG30iqOmr", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json index 42b67f2c6d..b39dab2a80 100644 --- a/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG-CF @Tiertime", - "inherits": "fdm_filament_pet", "renamed_from": "Tiertime Generic PETG-CF", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "97ZKNZS7uHaNzgLJ", "filament_id": "OFoYSJKi", diff --git a/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json index d7d10eedfc..8f9d28e4bf 100644 --- a/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PHA @Tiertime 300HS", - "inherits": "fdm_filament_pha", "renamed_from": "Tiertime Generic PHA@300HS;Tiertime Generic PHA300HS", + "inherits": "fdm_filament_pha", "from": "system", "setting_id": "cdIDNHr9YR5p1gQx", "filament_id": "OF74KeQR", diff --git a/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json index f0565e38a2..e75fdf606f 100644 --- a/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PHA @Tiertime", - "inherits": "fdm_filament_pha", "renamed_from": "Tiertime Generic PHA", + "inherits": "fdm_filament_pha", "from": "system", "setting_id": "GvzA9Y6mP5a767Qb", "filament_id": "OF74KeQR", diff --git a/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json index 58c56fee5d..b4ea8b127a 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Tiertime 300HS", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA@300HS;Tiertime Generic PLA300HS", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "VdXotPCaBzW0DswJ", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json index 5f8aaf4229..32deff2d0a 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Tiertime", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RuyaWPyP41WHbU7p", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json index 779cc6ca4e..ff349c9461 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Tiertime 300HS", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA High Speed@300HS;Tiertime Generic PLA High Speed300HS", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "cDQTrE11kyvmtj6l", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json index c88496b0e6..a943b78c86 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA High Speed @Tiertime", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA High Speed", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "HFwoDRXx0L72uTKc", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json index ba4745b50c..e74c192e6a 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Tiertime 300HS", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA Silk@300HS;Tiertime Generic PLA Silk300HS", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "pXFxVcPY3aVixOKU", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json index a2cbb3f4c4..755816a520 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA Silk @Tiertime", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA Silk", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "5R7nTGblzuEWfdog", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json index d4ceebf2db..a23c9b9fa2 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Tiertime 300HS", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA-CF@300HS;Tiertime Generic PLA-CF300HS", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CVks3a5cABQw38Ia", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json index 306ff427aa..f6fef07e95 100644 --- a/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Tiertime", - "inherits": "fdm_filament_pla", "renamed_from": "Tiertime Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "SSHFL8Wbk46BaTYF", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json index b79c34b466..52cfc3e370 100644 --- a/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP @Tiertime 300HS", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP@300HS;Tiertime Generic PP300HS", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "BmIuSlyYKMw76mqs", "filament_id": "OF1UNk9P", diff --git a/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json index 0b7361dc78..84876ea951 100644 --- a/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP @Tiertime", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "hbt3RXCxomod1cBQ", "filament_id": "OF1UNk9P", diff --git a/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json index e5a08307fa..4ca3b1f67a 100644 --- a/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP-CF @Tiertime 300HS", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP-CF@300HS;Tiertime Generic PP-CF300HS", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "u1Sqh9bCLFQvJxoS", "filament_id": "OFXkm8q1", diff --git a/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json index 4c8abaa8ce..39f9d257c4 100644 --- a/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP-CF @Tiertime", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP-CF", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "2giqoHCbRKiAuTyB", "filament_id": "OFXkm8q1", diff --git a/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json index 820f415b25..16eadd4a3c 100644 --- a/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP-GF @Tiertime 300HS", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP-GF@300HS;Tiertime Generic PP-GF300HS", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "Aiw0kkL0EFLNZ0zB", "filament_id": "OFsijjtH", diff --git a/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json index 930f2d7870..3648000b42 100644 --- a/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PP-GF @Tiertime", - "inherits": "fdm_filament_pp", "renamed_from": "Tiertime Generic PP-GF", + "inherits": "fdm_filament_pp", "from": "system", "setting_id": "HQaX19e4JViPTQn0", "filament_id": "OFsijjtH", diff --git a/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json index 6402b8a7c9..4dba9a28d4 100644 --- a/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPA-CF @Tiertime 300HS", - "inherits": "fdm_filament_ppa", "renamed_from": "Tiertime Generic PPA-CF@300HS;Tiertime Generic PPA-CF300HS", + "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "yEjRoG6UAmEBAsTg", "filament_id": "OF8tPByX", diff --git a/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json index 845cd1f1f3..a509513732 100644 --- a/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPA-CF @Tiertime", - "inherits": "fdm_filament_ppa", "renamed_from": "Tiertime Generic PPA-CF", + "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "C3VjtPXIQ9CikaQH", "filament_id": "OF8tPByX", diff --git a/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json index 75a81d0aff..5e3602b1a2 100644 --- a/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPA-GF @Tiertime 300HS", - "inherits": "fdm_filament_ppa", "renamed_from": "Tiertime Generic PPA-GF@300HS;Tiertime Generic PPA-GF300HS", + "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "9088HrpGRDIqqxTs", "filament_id": "OF8Tlg47", diff --git a/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json index 7ec50bd2f4..cbcd2dfc93 100644 --- a/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPA-GF @Tiertime", - "inherits": "fdm_filament_ppa", "renamed_from": "Tiertime Generic PPA-GF", + "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "jGP0en9vTFNmj5AJ", "filament_id": "OF8Tlg47", diff --git a/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json index bd804b9ffc..75d249dfaa 100644 --- a/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPS @Tiertime 300HS", - "inherits": "fdm_filament_pps", "renamed_from": "Tiertime Generic PPS@300HS;Tiertime Generic PPS300HS", + "inherits": "fdm_filament_pps", "from": "system", "setting_id": "KIspUdArMQzvDtcX", "filament_id": "OFq9svOz", diff --git a/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json index dbb381012e..f0f1980545 100644 --- a/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPS @Tiertime", - "inherits": "fdm_filament_pps", "renamed_from": "Tiertime Generic PPS", + "inherits": "fdm_filament_pps", "from": "system", "setting_id": "NCTW11dGCzTxasjU", "filament_id": "OFq9svOz", diff --git a/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json index f53a77c9c6..ce5102519b 100644 --- a/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPS-CF @Tiertime 300HS", - "inherits": "fdm_filament_pps", "renamed_from": "Tiertime Generic PPS-CF@300HS;Tiertime Generic PPS-CF300HS", + "inherits": "fdm_filament_pps", "from": "system", "setting_id": "E7mVBEFECdf1mhXE", "filament_id": "OF6rdQ6M", diff --git a/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json index 3e4e15da7d..0cf6dad6d3 100644 --- a/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PPS-CF @Tiertime", - "inherits": "fdm_filament_pps", "renamed_from": "Tiertime Generic PPS-CF", + "inherits": "fdm_filament_pps", "from": "system", "setting_id": "QUPOb7dBkg6bPul2", "filament_id": "OF6rdQ6M", diff --git a/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json index 2efe590fb6..ab6e0df772 100644 --- a/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Tiertime 300HS", - "inherits": "fdm_filament_pva", "renamed_from": "Tiertime Generic PVA@300HS;Tiertime Generic PVA300HS", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "E8fgXFvjTnIpqdrg", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json index 588648b8b0..d4d0492e25 100644 --- a/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Tiertime", - "inherits": "fdm_filament_pva", "renamed_from": "Tiertime Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "6R2BduAh4ASmGbDd", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json index f3860b4e64..a25e559f84 100644 --- a/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic SBS @Tiertime 300HS", - "inherits": "fdm_filament_sbs", "renamed_from": "Tiertime Generic SBS@300HS;Tiertime Generic SBS300HS", + "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "nS6aGQgepNoAjumo", "filament_id": "OFhQfUQY", diff --git a/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json index 7c4751aa34..76ecfb07df 100644 --- a/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic SBS @Tiertime", - "inherits": "fdm_filament_sbs", "renamed_from": "Tiertime Generic SBS", + "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "nyv523sDXK9fDbtb", "filament_id": "OFhQfUQY", diff --git a/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json index 2d52d479d3..5d8121ea22 100644 --- a/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json +++ b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic TPU @Tiertime 300HS", - "inherits": "fdm_filament_tpu", "renamed_from": "Tiertime Generic TPU@300HS;Tiertime Generic TPU300HS", + "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFgbpcy9", "setting_id": "99UYNDy3zV3bChRG", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json index a32f1173dc..24db1ff710 100644 --- a/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json +++ b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic TPU @Tiertime", - "inherits": "fdm_filament_tpu", "renamed_from": "Tiertime Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFgbpcy9", "setting_id": "UCowa7X5TZwXBJWe", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS.json b/resources/profiles/Tiertime/filament/Tiertime ABS.json index 4ff6b5c8fd..2821a27abe 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFNQKF0M", - "setting_id": "uAtyf2jCQEcv7D2r", "name": "Tiertime ABS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "uAtyf2jCQEcv7D2r", + "filament_id": "OFNQKF0M", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json index 7014efe177..440ef41f48 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFNQKF0M", - "setting_id": "x1XBGyOHIgrD7PVs", "name": "Tiertime ABS@300HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "x1XBGyOHIgrD7PVs", + "filament_id": "OFNQKF0M", + "instantiation": "true", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA.json b/resources/profiles/Tiertime/filament/Tiertime PLA.json index d0a030184a..72eba01283 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFNGTH3w", - "setting_id": "dlXQZNrJfvkJ3kWs", "name": "Tiertime PLA", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "dlXQZNrJfvkJ3kWs", + "filament_id": "OFNGTH3w", + "instantiation": "true", "filament_cost": [ "24.99" ], diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json index 48073d5c76..6707898c2b 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFNGTH3w", - "setting_id": "bqWrzfz6CXHohbpL", "name": "Tiertime PLA@300HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "bqWrzfz6CXHohbpL", + "filament_id": "OFNGTH3w", + "instantiation": "true", "filament_cost": [ "24.99" ], diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json index 63c5e51e50..f4e621c1ca 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "lgltuIatOQ6w6QbU", "name": "Tiertime UP300 HS 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_tiertime_common", + "from": "system", + "setting_id": "lgltuIatOQ6w6QbU", + "instantiation": "true", "printer_model": "Tiertime UP300 HS", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json index 8baee541a6..7dae9872c8 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "HMZ8IXHF9SCYY794", "name": "Tiertime UP310 Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_tiertime_common", + "from": "system", + "setting_id": "HMZ8IXHF9SCYY794", + "instantiation": "true", "printer_model": "Tiertime UP310 Pro", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json index ce65946a41..c7c4473c55 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "92AYB3s93gFz7ZPX", "name": "Tiertime UP400 Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_tiertime_common", + "from": "system", + "setting_id": "92AYB3s93gFz7ZPX", + "instantiation": "true", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json index 272017038f..ac5ce33f63 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "6NLuMd5QTEV7Dz7y", "name": "Tiertime UP400 Pro 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Tiertime UP400 Pro 0.4 nozzle", + "from": "system", + "setting_id": "6NLuMd5QTEV7Dz7y", + "instantiation": "true", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json index f43bda57a8..ed5c96f834 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "MieJsq4OcDXSPeYE", "name": "Tiertime UP400 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Tiertime UP400 Pro 0.4 nozzle", + "from": "system", + "setting_id": "MieJsq4OcDXSPeYE", + "instantiation": "true", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json index a18c2a938f..2691e807ae 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "6aAsuPmotiaU41L4", "name": "Tiertime UP600 HS 0.4 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_tiertime_common", + "from": "system", + "setting_id": "6aAsuPmotiaU41L4", + "instantiation": "true", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json index ea706dede8..1deed12abb 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "4xd2mlCoTuJoXmOf", "name": "Tiertime UP600 HS 0.6 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Tiertime UP600 HS 0.4 nozzle", + "from": "system", + "setting_id": "4xd2mlCoTuJoXmOf", + "instantiation": "true", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json index d114741fb9..ed010446c0 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "tqKPATsUnwQWjXso", "name": "Tiertime UP600 HS 0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "Tiertime UP600 HS 0.4 nozzle", + "from": "system", + "setting_id": "tqKPATsUnwQWjXso", + "instantiation": "true", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json index 68d60b1e2c..eb94220c60 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "kJslDhHisZSqoNLu", "name": "0.12mm Fine @Tiertime UP300 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "kJslDhHisZSqoNLu", + "instantiation": "true", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json index 0b3375f656..8791d34371 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "u1Hfo84e0ffI39MP", "name": "0.12mm Fine @Tiertime UP310 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "u1Hfo84e0ffI39MP", + "instantiation": "true", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json index 019d4617af..b6f1519ac9 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "LiT2jc5HHSsxdPOY", "name": "0.12mm Fine @Tiertime UP400 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "LiT2jc5HHSsxdPOY", + "instantiation": "true", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json index 63f7b269d1..6777672d93 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "LwKN2IKIgniQAUbc", "name": "0.12mm Fine @Tiertime UP600 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "LwKN2IKIgniQAUbc", + "instantiation": "true", "layer_height": "0.12", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "5", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json index ed678b16bd..c9b9295809 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "deEyVahMnJBIUh5W", "name": "0.16mm Optimal @Tiertime UP300 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "deEyVahMnJBIUh5W", + "instantiation": "true", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json index 189ac439e2..51355d03ec 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "89hv0us5IMmhpDol", "name": "0.16mm Optimal @Tiertime UP310 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "89hv0us5IMmhpDol", + "instantiation": "true", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json index 7a4b5943a5..2d3abf48f1 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "yZBSB83IptM1eMzO", "name": "0.16mm Optimal @Tiertime UP400 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "yZBSB83IptM1eMzO", + "instantiation": "true", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json index b172f23ca4..36a7232b91 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "BfOJljkGUCnVJ0zM", "name": "0.16mm Optimal @Tiertime UP600 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "BfOJljkGUCnVJ0zM", + "instantiation": "true", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json index 8d9947736b..9fc8e95fee 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "4a1IpFohcCPCxI1I", "name": "0.20mm Standard @Tiertime UP300 HS", - "from": "system", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "4a1IpFohcCPCxI1I", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json index 834b645e2e..b03937aa1c 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "48QrtoSmDHWLbuck", "name": "0.20mm Standard @Tiertime UP310 Pro", - "from": "system", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "48QrtoSmDHWLbuck", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json index d196edc5ca..0013fe4e77 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "QotYAumKUh7h5cBH", "name": "0.20mm Standard @Tiertime UP400 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "QotYAumKUh7h5cBH", + "instantiation": "true", "layer_height": "0.2", "initial_layer_speed": "50", "initial_layer_infill_speed": "105", diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json index 3db84cce38..7df15ed346 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "FKDS8Ql5ApZdlsH8", "name": "0.20mm Standard @Tiertime UP600 HS", - "from": "system", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "FKDS8Ql5ApZdlsH8", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json index a209d85d93..ec71aa67b9 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "clvHKafqg81lxC4s", "name": "0.24mm Draft @Tiertime UP300 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "clvHKafqg81lxC4s", + "instantiation": "true", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json index bb2d11bcf5..ab2c2fc69a 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "zr1zPgeqxJog1iO6", "name": "0.24mm Draft @Tiertime UP310 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "zr1zPgeqxJog1iO6", + "instantiation": "true", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json index 8ad2181ba3..49e7f95c99 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "L84Tpur6DqX0WI9U", "name": "0.24mm Draft @Tiertime UP400 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "L84Tpur6DqX0WI9U", + "instantiation": "true", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json index 730b3fdb91..43705dd6d3 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "D7fl6dZLCLa5n8Es", "name": "0.24mm Draft @Tiertime UP600 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "D7fl6dZLCLa5n8Es", + "instantiation": "true", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json index 34f7f7221a..0dc2af9312 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "CBOtpFjUICGttrgV", "name": "0.28mm Extra Draft @Tiertime UP300 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "CBOtpFjUICGttrgV", + "instantiation": "true", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json index 0b6617941f..f822d31bc5 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "ODXIraViN4sdzaKe", "name": "0.28mm Extra Draft @Tiertime UP310 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "ODXIraViN4sdzaKe", + "instantiation": "true", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json index 5c11562a22..5d5f598ae9 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "bfRd7zHG5JoOWdXb", "name": "0.28mm Extra Draft @Tiertime UP400 Pro", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_common", + "from": "system", + "setting_id": "bfRd7zHG5JoOWdXb", + "instantiation": "true", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json index 60b1b484ee..646ad3cab9 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "gl1nKSyprhumL6ci", "name": "0.28mm Extra Draft @Tiertime UP600 HS", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_tiertime_HS_common", + "from": "system", + "setting_id": "gl1nKSyprhumL6ci", + "instantiation": "true", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", diff --git a/resources/profiles/TwoTrees.json b/resources/profiles/TwoTrees.json index 5d97581ffc..3735f19d98 100644 --- a/resources/profiles/TwoTrees.json +++ b/resources/profiles/TwoTrees.json @@ -1,6 +1,6 @@ { "name": "TwoTrees", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "1", "description": "TwoTrees configurations", "machine_model_list": [ diff --git a/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json b/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json index fd22e6417a..fae333784c 100644 --- a/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json +++ b/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic HS PLA @TwoTrees SK1", - "inherits": "fdm_filament_pla", "renamed_from": "TwoTrees Generic HS PLA @SK1;TwoTrees Generic HS PLA SK1", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "uRS2QA3xad1lBZJR", "filament_id": "OFvxghTE", diff --git a/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json b/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json index 6f0221b92c..e6580e78f9 100644 --- a/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json +++ b/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU 95A @TwoTrees SK1", - "inherits": "fdm_filament_tpu", "renamed_from": "TwoTrees Generic 95A TPU @SK1;TwoTrees Generic 95A TPU SK1", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "hAqaYYR7xzkcr2xC", "filament_id": "OFjiXpyf", diff --git a/resources/profiles/UltiMaker.json b/resources/profiles/UltiMaker.json index 5d55de2c8d..14bce7c6da 100644 --- a/resources/profiles/UltiMaker.json +++ b/resources/profiles/UltiMaker.json @@ -1,7 +1,7 @@ { "name": "UltiMaker", "url": "", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "UltiMaker configurations", "machine_model_list": [ diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json index 2d35c6e350..a0047cf733 100644 --- a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "name": "Generic ABS @UltiMaker 2 0.4 nozzle", + "name": "Generic ABS @UltiMaker 2 0.4 nozzle", "inherits": "Generic ABS @System", "from": "system", "setting_id": "z65YPRPvIareA5TJ", @@ -9,6 +9,9 @@ "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], @@ -37,6 +40,6 @@ "1" ], "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" + "UltiMaker 2 0.4 nozzle" ] } diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json index 3f10cf2170..6c748cb3b9 100644 --- a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic ABS @UltiMaker 2 0.6 nozzle", - "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "eo9lcJAw8yrGBWr8", - "filament_id": "OFY9muEs", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "6" - ], - "compatible_printers": [ - "UltiMaker 2 0.6 nozzle" - ] + "type": "filament", + "name": "Generic ABS @UltiMaker 2 0.6 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "eo9lcJAw8yrGBWr8", + "filament_id": "OFY9muEs", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json index e445d8afd2..9449b0790f 100644 --- a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic ABS @UltiMaker 2 0.8 nozzle", - "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "1VE4ie9s2gYKUx7r", - "filament_id": "OFY9muEs", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "6" - ], - "compatible_printers": [ - "UltiMaker 2 0.8 nozzle" - ] + "type": "filament", + "name": "Generic ABS @UltiMaker 2 0.8 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "1VE4ie9s2gYKUx7r", + "filament_id": "OFY9muEs", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json index ff74b46449..e1d143a97d 100644 --- a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "name": "Generic PETG @UltiMaker 2 0.4 nozzle", + "name": "Generic PETG @UltiMaker 2 0.4 nozzle", "inherits": "Generic PETG @System", "from": "system", "setting_id": "WR3y0y8gmWH40llb", @@ -9,6 +9,9 @@ "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "6" ], @@ -28,6 +31,6 @@ "0" ], "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" + "UltiMaker 2 0.4 nozzle" ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json index a0a8efb1e3..11a9702bd2 100644 --- a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic PETG @UltiMaker 2 0.6 nozzle", - "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "koLquuN6eQo8Zn5V", - "filament_id": "OFYPdQJh", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "6" - ], - "compatible_printers": [ - "UltiMaker 2 0.6 nozzle" - ] + "type": "filament", + "name": "Generic PETG @UltiMaker 2 0.6 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "koLquuN6eQo8Zn5V", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json index 10590aa46a..32fa6828ca 100644 --- a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic PETG @UltiMaker 2 0.8 nozzle", - "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "ZtVG7edcUktSNI0P", - "filament_id": "OFYPdQJh", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "6" - ], - "compatible_printers": [ - "UltiMaker 2 0.8 nozzle" - ] + "type": "filament", + "name": "Generic PETG @UltiMaker 2 0.8 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "ZtVG7edcUktSNI0P", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json index c2c9b67fb9..0e78193ab5 100644 --- a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "name": "Generic PLA @UltiMaker 2 0.4 nozzle", + "name": "Generic PLA @UltiMaker 2 0.4 nozzle", "inherits": "Generic PLA @System", "from": "system", "setting_id": "3i42yTge4Nm6R2Yo", @@ -9,6 +9,9 @@ "filament_diameter": [ "2.85" ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], "filament_max_volumetric_speed": [ "8" ], @@ -25,6 +28,6 @@ "200" ], "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" + "UltiMaker 2 0.4 nozzle" ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json index 3f4c74f8ab..7882b5ad40 100644 --- a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic PLA @UltiMaker 2 0.6 nozzle", - "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "yvWYFuY9SPIwwSVG", - "filament_id": "OFDSrzZ8", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "compatible_printers": [ - "UltiMaker 2 0.6 nozzle" - ] + "type": "filament", + "name": "Generic PLA @UltiMaker 2 0.6 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "yvWYFuY9SPIwwSVG", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json index 91aaf5f1dc..1c83931279 100644 --- a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json @@ -1,18 +1,21 @@ { - "type": "filament", - "name": "Generic PLA @UltiMaker 2 0.8 nozzle", - "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", - "from": "system", - "setting_id": "4yvMTmMYkCvggt0f", - "filament_id": "OFDSrzZ8", - "instantiation": "true", - "filament_diameter": [ - "2.85" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "compatible_printers": [ - "UltiMaker 2 0.8 nozzle" - ] + "type": "filament", + "name": "Generic PLA @UltiMaker 2 0.8 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "4yvMTmMYkCvggt0f", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] } diff --git a/resources/profiles/UltiMaker/machine/UltiMaker S5 0.4 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker S5 0.4 nozzle.json index 5c212070b7..7ed7c97f40 100644 --- a/resources/profiles/UltiMaker/machine/UltiMaker S5 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/machine/UltiMaker S5 0.4 nozzle.json @@ -20,62 +20,93 @@ "printable_height": "300", "extruder_clearance_height_to_rod": "60", "extruder_clearance_radius": "61", - "nozzle_type": "brass", + "nozzle_type": [ + "brass", + "brass" + ], "auxiliary_fan": "0", "use_relative_e_distances": "0", "machine_max_acceleration_extruding": [ + "3500", + "3500", "3500", "3500" ], "machine_max_acceleration_retracting": [ + "3500", + "3500", "3500", "3500" ], "machine_max_acceleration_travel": [ + "3500", + "3500", "3500", "3500" ], "machine_max_acceleration_x": [ + "3500", + "3500", "3500", "3500" ], "machine_max_acceleration_y": [ + "3500", + "3500", "3500", "3500" ], "machine_max_acceleration_z": [ + "500", + "500", "500", "500" ], "machine_max_speed_e": [ + "120", + "120", "120", "120" ], "machine_max_speed_x": [ + "500", + "500", "500", "500" ], "machine_max_speed_y": [ + "500", + "500", "500", "500" ], "machine_max_speed_z": [ + "12", + "12", "12", "12" ], "machine_max_jerk_e": [ + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "20", + "20", "20", "20" ], "machine_max_jerk_y": [ + "20", + "20", "20", "20" ], "machine_max_jerk_z": [ + "0.4", + "0.4", "0.4", "0.4" ], @@ -89,24 +120,31 @@ ], "printer_settings_id": "Qidi", "retraction_minimum_travel": [ + "5", "5" ], "retract_before_wipe": [ + "70%", "70%" ], "retraction_length": [ + "4.5", "4.5" ], "retract_length_toolchange": [ + "11", "11" ], "retraction_speed": [ + "45", "45" ], "deretraction_speed": [ + "0", "0" ], "wipe_distance": [ + "0.2", "0.2" ], "single_extruder_multi_material": "0", @@ -116,9 +154,11 @@ "Generic PLA @System" ], "z_hop": [ + "1", "1" ], "z_hop_types": [ + "Normal Lift", "Normal Lift" ], "extruder_type": [ diff --git a/resources/profiles/Volumic.json b/resources/profiles/Volumic.json index 7923f2d92f..a287eaadb9 100644 --- a/resources/profiles/Volumic.json +++ b/resources/profiles/Volumic.json @@ -1,6 +1,6 @@ { "name": "Volumic", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "1", "description": "VOLUMIC configurations", "machine_model_list": [ diff --git a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json index 6b67c28f15..a05855a0be 100644 --- a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json +++ b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFcKtw8W", - "setting_id": "wuZ0EvlbcJ8GxajY", "name": "PA6 CF20 (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pa", + "from": "system", + "setting_id": "wuZ0EvlbcJ8GxajY", + "filament_id": "OFcKtw8W", + "instantiation": "true", "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Volumic/filament/PETG ESD (Performance).json b/resources/profiles/Volumic/filament/PETG ESD (Performance).json index 06814b64ad..bcf98c14cf 100644 --- a/resources/profiles/Volumic/filament/PETG ESD (Performance).json +++ b/resources/profiles/Volumic/filament/PETG ESD (Performance).json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFiwEbze", - "setting_id": "May8rNEMOOs1qtae", "name": "PETG ESD (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "May8rNEMOOs1qtae", + "filament_id": "OFiwEbze", + "instantiation": "true", "filament_type": [ "PETG-ESD" ], diff --git a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json index 4708f912c4..4c1b5008d1 100644 --- a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json +++ b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFEZpel7", - "setting_id": "HE0yILdkhbiXbH1j", "name": "PPS Carbone (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pa", + "from": "system", + "setting_id": "HE0yILdkhbiXbH1j", + "filament_id": "OFEZpel7", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json index 865f03155e..d4034d948d 100644 --- a/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFyQwdaM", - "setting_id": "466ggy6ydgaZOrSx", "name": "Volumic ABS Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "466ggy6ydgaZOrSx", + "filament_id": "OFyQwdaM", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic ABS Ultra.json b/resources/profiles/Volumic/filament/Volumic ABS Ultra.json index f538936b5a..e14dc59a63 100644 --- a/resources/profiles/Volumic/filament/Volumic ABS Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic ABS Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFyUJI3q", - "setting_id": "omHiTINFPThooUqk", "name": "Volumic ABS Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "omHiTINFPThooUqk", + "filament_id": "OFyUJI3q", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json index 519387adf5..dd695adfa9 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFU7CKZt", - "setting_id": "uE5jxeOBISvO5o7L", "name": "Volumic ASA Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "uE5jxeOBISvO5o7L", + "filament_id": "OFU7CKZt", + "instantiation": "true", "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json index 2225125c3c..c7ddf544e6 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OF2EB9Iz", - "setting_id": "LOAp2zgQWqg1lQQ4", "name": "Volumic ASA Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "LOAp2zgQWqg1lQQ4", + "filament_id": "OF2EB9Iz", + "instantiation": "true", "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json index 54d0f89bb3..29b67af7be 100644 --- a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFUH1aee", - "setting_id": "k5V3bjZrtr7t8zl0", "name": "Volumic FLEX93 Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "k5V3bjZrtr7t8zl0", + "filament_id": "OFUH1aee", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json index 84ccdc6d19..0dc1dd1f25 100644 --- a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFuxH0Uz", - "setting_id": "DXZ4Gp5XP5VCJTXY", "name": "Volumic FLEX93 Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "DXZ4Gp5XP5VCJTXY", + "filament_id": "OFuxH0Uz", + "instantiation": "true", "filament_flow_ratio": [ "1.20" ], diff --git a/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json index 8a4b44f59b..7e7c77f261 100644 --- a/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFi90KlM", - "setting_id": "RC5gFyIejXWDJuHH", "name": "Volumic NYLON Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pa", + "from": "system", + "setting_id": "RC5gFyIejXWDJuHH", + "filament_id": "OFi90KlM", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json b/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json index 95c5f81a6a..9d1d5a868b 100644 --- a/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFWa0NiB", - "setting_id": "AL4xDgN8EIYb3UrL", "name": "Volumic NYLON Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pa", + "from": "system", + "setting_id": "AL4xDgN8EIYb3UrL", + "filament_id": "OFWa0NiB", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PC Performance.json b/resources/profiles/Volumic/filament/Volumic PC Performance.json index d454de5688..3e36b87207 100644 --- a/resources/profiles/Volumic/filament/Volumic PC Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PC Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFgSbX7E", - "setting_id": "ht6Ar3ilCkPT7geN", "name": "Volumic PC (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "ht6Ar3ilCkPT7geN", + "filament_id": "OFgSbX7E", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PC.json b/resources/profiles/Volumic/filament/Volumic PC.json index 12ea420585..46f1d63eb8 100644 --- a/resources/profiles/Volumic/filament/Volumic PC.json +++ b/resources/profiles/Volumic/filament/Volumic PC.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFaHjk1V", - "setting_id": "3pUnwXise3J77Qmc", "name": "Volumic PC", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "3pUnwXise3J77Qmc", + "filament_id": "OFaHjk1V", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json index 5e20cb2922..2000a1e00b 100644 --- a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json +++ b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFTdauIq", - "setting_id": "NdegYSDVrQ4Rawtp", "name": "Volumic PCTG Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "NdegYSDVrQ4Rawtp", + "filament_id": "OFTdauIq", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json index 6b98fc49d2..710dfb07f1 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFsD974q", - "setting_id": "bNcC5kGe9jOm7Ltu", "name": "Volumic PETG Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "bNcC5kGe9jOm7Ltu", + "filament_id": "OFsD974q", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json index 91827ebe80..9b08425013 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFY0F5qA", - "setting_id": "IIFtCkVvHoLtxPxj", "name": "Volumic PETG Ultra carbone (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "IIFtCkVvHoLtxPxj", + "filament_id": "OFY0F5qA", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json index 137bad9d53..77753061a9 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFu08yGN", - "setting_id": "nOKT0adoQi3O7Tge", "name": "Volumic PETG Ultra carbone", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "nOKT0adoQi3O7Tge", + "filament_id": "OFu08yGN", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra.json index 8db07d0bab..b89510318e 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFG0kOKX", - "setting_id": "CuBXW7SqUeJOcxPP", "name": "Volumic PETG Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "CuBXW7SqUeJOcxPP", + "filament_id": "OFG0kOKX", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json index 2a02fe7c88..38011bd086 100644 --- a/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OF3dJf4E", - "setting_id": "8J2ZIz8ByFNEB9PC", "name": "Volumic PLA Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "8J2ZIz8ByFNEB9PC", + "filament_id": "OF3dJf4E", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PLA Ultra.json b/resources/profiles/Volumic/filament/Volumic PLA Ultra.json index 2e5f762d39..a3bb2d5ade 100644 --- a/resources/profiles/Volumic/filament/Volumic PLA Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PLA Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFXuGxvQ", - "setting_id": "3BeQ60i4cOs3BfZn", "name": "Volumic PLA Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "3BeQ60i4cOs3BfZn", + "filament_id": "OFXuGxvQ", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json index 3fafb8aac0..6033de8045 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFNSYu5h", - "setting_id": "nsiOJ8ExySR1RksQ", "name": "Volumic PP Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pp", + "from": "system", + "setting_id": "nsiOJ8ExySR1RksQ", + "filament_id": "OFNSYu5h", + "instantiation": "true", "filament_flow_ratio": [ "1.0" ], diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra.json b/resources/profiles/Volumic/filament/Volumic PP Ultra.json index eba78219bc..b0b4d675fb 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFsFo7ms", - "setting_id": "UA91pv54dzbBRkFe", "name": "Volumic PP Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pp", + "from": "system", + "setting_id": "UA91pv54dzbBRkFe", + "filament_id": "OFsFo7ms", + "instantiation": "true", "filament_flow_ratio": [ "1.24" ], diff --git a/resources/profiles/Volumic/filament/Volumic PVA Performance.json b/resources/profiles/Volumic/filament/Volumic PVA Performance.json index 199d33ed62..f4e7617cad 100644 --- a/resources/profiles/Volumic/filament/Volumic PVA Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PVA Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFRkjhxK", - "setting_id": "L9ZTGhwNpVWT6E5j", "name": "Volumic PVA-BVOH (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pva", + "from": "system", + "setting_id": "L9ZTGhwNpVWT6E5j", + "filament_id": "OFRkjhxK", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic PVA.json b/resources/profiles/Volumic/filament/Volumic PVA.json index 24c28a89a5..87c5c0eda3 100644 --- a/resources/profiles/Volumic/filament/Volumic PVA.json +++ b/resources/profiles/Volumic/filament/Volumic PVA.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFGdP6Na", - "setting_id": "rw4bB5gYM6YF8v9e", "name": "Volumic PVA", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pva", + "from": "system", + "setting_id": "rw4bB5gYM6YF8v9e", + "filament_id": "OFGdP6Na", + "instantiation": "true", "filament_flow_ratio": [ "1.00" ], diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json index 90562ebba2..00d3cb5470 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFkGp50Y", - "setting_id": "rxVkBvMZYgHOoFW6", "name": "Volumic UNIVERSAL Ultra (Performance)", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "rxVkBvMZYgHOoFW6", + "filament_id": "OFkGp50Y", + "instantiation": "true", "filament_type": [ "UNIV" ], diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json index ee50a25ffd..dde1298f20 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFpumhCM", - "setting_id": "6iOFERN4x6xBbtuT", "name": "Volumic UNIVERSAL Ultra", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "6iOFERN4x6xBbtuT", + "filament_id": "OFpumhCM", + "instantiation": "true", "filament_type": [ "UNIV" ], diff --git a/resources/profiles/Volumic/filament/desactive.json b/resources/profiles/Volumic/filament/desactive.json index 1c490c957e..0089e61965 100644 --- a/resources/profiles/Volumic/filament/desactive.json +++ b/resources/profiles/Volumic/filament/desactive.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFCuaCer", - "setting_id": "Sphn4hoDMpH2uy86", "name": "Désactivé", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "Sphn4hoDMpH2uy86", + "filament_id": "OFCuaCer", + "instantiation": "true", "filament_flow_ratio": [ "0.1" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_abs.json b/resources/profiles/Volumic/filament/fdm_filament_abs.json index c959efccf7..02d839f175 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_abs.json +++ b/resources/profiles/Volumic/filament/fdm_filament_abs.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_abs", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "90" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_asa.json b/resources/profiles/Volumic/filament/fdm_filament_asa.json index 250673c190..d009bac400 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_asa.json +++ b/resources/profiles/Volumic/filament/fdm_filament_asa.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_asa", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pa.json b/resources/profiles/Volumic/filament/fdm_filament_pa.json index f2b3db1bfd..9c86cca422 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pa.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pa.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pa", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "65" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pc.json b/resources/profiles/Volumic/filament/fdm_filament_pc.json index 72cbc789dc..6bebbfecf4 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pc.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pc.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pc", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pet.json b/resources/profiles/Volumic/filament/fdm_filament_pet.json index 14ab033789..5214dff875 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pet.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pet.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pet", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pla.json b/resources/profiles/Volumic/filament/fdm_filament_pla.json index 2fc9a8ef1d..51e8fd14a8 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pla.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pla.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pla", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "fan_cooling_layer_time": [ "100" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pp.json b/resources/profiles/Volumic/filament/fdm_filament_pp.json index 9c0f879608..0c654aa06f 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pp.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pp.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pp", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "90" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_pva.json b/resources/profiles/Volumic/filament/fdm_filament_pva.json index 549dd8bcc8..1c8b0ffc48 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_pva.json +++ b/resources/profiles/Volumic/filament/fdm_filament_pva.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pva", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "60" ], diff --git a/resources/profiles/Volumic/filament/fdm_filament_tpu.json b/resources/profiles/Volumic/filament/fdm_filament_tpu.json index be647956f6..aba5d3fd64 100644 --- a/resources/profiles/Volumic/filament/fdm_filament_tpu.json +++ b/resources/profiles/Volumic/filament/fdm_filament_tpu.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_tpu", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "cool_plate_temp": [ "45" ], diff --git a/resources/profiles/Volumic/machine/EXO42 (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 (0.4 nozzle).json index 2a9fad874e..b16c9969cc 100644 --- a/resources/profiles/Volumic/machine/EXO42 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "38SnDDmFg2mCRcFt", "name": "EXO42 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "38SnDDmFg2mCRcFt", + "instantiation": "true", "printer_model": "EXO42", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y419 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/EXO42 IDRE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 IDRE (0.4 nozzle).json index e1b362df83..3c4e6f6ef4 100644 --- a/resources/profiles/Volumic/machine/EXO42 IDRE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 IDRE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "15K6j1YDiO2ubyZq", "name": "EXO42 IDRE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "15K6j1YDiO2ubyZq", + "instantiation": "true", "printer_model": "EXO42 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x420" ], "printable_height": "400", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO42 IDRE COPY MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 IDRE COPY MODE (0.4 nozzle).json index 0f6303fd19..77c44ae3de 100644 --- a/resources/profiles/Volumic/machine/EXO42 IDRE COPY MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 IDRE COPY MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "cNF164YBrD1xcG2h", "name": "EXO42 IDRE COPY MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "cNF164YBrD1xcG2h", + "instantiation": "true", "printer_model": "EXO42 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x420" ], "printable_height": "400", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO42 IDRE MIRROR MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 IDRE MIRROR MODE (0.4 nozzle).json index 1c5f5d1700..b3188dbbc4 100644 --- a/resources/profiles/Volumic/machine/EXO42 IDRE MIRROR MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 IDRE MIRROR MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "OMdv9AS4d4HDXYB7", "name": "EXO42 IDRE MIRROR MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "OMdv9AS4d4HDXYB7", + "instantiation": "true", "printer_model": "EXO42 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x420" ], "printable_height": "400", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO42 Performance (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 Performance (0.4 nozzle).json index fbece162b5..4066c6e917 100644 --- a/resources/profiles/Volumic/machine/EXO42 Performance (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 Performance (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "uSgdeLwfwMCIF8jJ", "name": "EXO42 Performance (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "uSgdeLwfwMCIF8jJ", + "instantiation": "true", "printer_model": "EXO42 Performance", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/EXO42 Stage 2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO42 Stage 2 (0.4 nozzle).json index 978af519f6..0ae74783f7 100644 --- a/resources/profiles/Volumic/machine/EXO42 Stage 2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO42 Stage 2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "nFLSTPErGjQw6XnS", "name": "EXO42 Stage 2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "nFLSTPErGjQw6XnS", + "instantiation": "true", "printer_model": "EXO42 Stage 2", "default_print_profile": "Normal speed (Stage 2) - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/EXO65 (0.6 nozzle).json b/resources/profiles/Volumic/machine/EXO65 (0.6 nozzle).json index 8ca2438da9..75ed1f5a42 100644 --- a/resources/profiles/Volumic/machine/EXO65 (0.6 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 (0.6 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "N5hPPEyrF6WFPO8r", "name": "EXO65 (0.6 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "N5hPPEyrF6WFPO8r", + "instantiation": "true", "printer_model": "EXO65", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y649 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/EXO65 IDRE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO65 IDRE (0.4 nozzle).json index 8d67f7fa06..2f528e297c 100644 --- a/resources/profiles/Volumic/machine/EXO65 IDRE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 IDRE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "eInlnTPT9RXNQe0H", "name": "EXO65 IDRE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "eInlnTPT9RXNQe0H", + "instantiation": "true", "printer_model": "EXO65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x650" ], "printable_height": "630", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO65 IDRE COPY MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO65 IDRE COPY MODE (0.4 nozzle).json index 6609ff57cc..5f3d3b2a40 100644 --- a/resources/profiles/Volumic/machine/EXO65 IDRE COPY MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 IDRE COPY MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "qTCFDCqFaq5Cr2MK", "name": "EXO65 IDRE COPY MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "qTCFDCqFaq5Cr2MK", + "instantiation": "true", "printer_model": "EXO65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x650" ], "printable_height": "630", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO65 IDRE MIRROR MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO65 IDRE MIRROR MODE (0.4 nozzle).json index e331184117..3a3fe5d234 100644 --- a/resources/profiles/Volumic/machine/EXO65 IDRE MIRROR MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 IDRE MIRROR MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "CRmhnf8ONHFpDZ9p", "name": "EXO65 IDRE MIRROR MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "CRmhnf8ONHFpDZ9p", + "instantiation": "true", "printer_model": "EXO65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x650" ], "printable_height": "630", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/EXO65 Performance (0.4 nozzle).json b/resources/profiles/Volumic/machine/EXO65 Performance (0.4 nozzle).json index 54c15d80b0..1e24b85f67 100644 --- a/resources/profiles/Volumic/machine/EXO65 Performance (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 Performance (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "Iokq2oBwJVaEwT9A", "name": "EXO65 Performance (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "Iokq2oBwJVaEwT9A", + "instantiation": "true", "printer_model": "EXO65 Performance", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/EXO65 Performance (0.6 nozzle).json b/resources/profiles/Volumic/machine/EXO65 Performance (0.6 nozzle).json index 8bbc66ef38..2f63efbec5 100644 --- a/resources/profiles/Volumic/machine/EXO65 Performance (0.6 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 Performance (0.6 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "WWrVx8eGg8rm1saw", "name": "EXO65 Performance (0.6 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "WWrVx8eGg8rm1saw", + "instantiation": "true", "printer_model": "EXO65 Performance", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/EXO65 Performance (0.8 nozzle).json b/resources/profiles/Volumic/machine/EXO65 Performance (0.8 nozzle).json index cb2b91161b..65a5b685a5 100644 --- a/resources/profiles/Volumic/machine/EXO65 Performance (0.8 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 Performance (0.8 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "4LGJDuCA7yAKGml3", "name": "EXO65 Performance (0.8 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "4LGJDuCA7yAKGml3", + "instantiation": "true", "printer_model": "EXO65 Performance", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/EXO65 Stage 2 (0.6 nozzle).json b/resources/profiles/Volumic/machine/EXO65 Stage 2 (0.6 nozzle).json index 735e1843bc..f3d7d90d76 100644 --- a/resources/profiles/Volumic/machine/EXO65 Stage 2 (0.6 nozzle).json +++ b/resources/profiles/Volumic/machine/EXO65 Stage 2 (0.6 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "jsBm1DhY7qw63SSI", "name": "EXO65 Stage 2 (0.6 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "jsBm1DhY7qw63SSI", + "instantiation": "true", "printer_model": "EXO65 Stage 2", "default_print_profile": "Normal speed (Stage 2) - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/SH65 (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 (0.4 nozzle).json index a49591a421..944e773cc3 100644 --- a/resources/profiles/Volumic/machine/SH65 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "EeJsStZPNfCT7WkW", "name": "SH65 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "EeJsStZPNfCT7WkW", + "instantiation": "true", "printer_model": "SH65", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y299 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/SH65 IDRE (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 IDRE (0.4 nozzle).json index a316163582..c695d8bc72 100644 --- a/resources/profiles/Volumic/machine/SH65 IDRE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 IDRE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "aKBeUSXzBU2qQIEE", "name": "SH65 IDRE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "aKBeUSXzBU2qQIEE", + "instantiation": "true", "printer_model": "SH65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x300" ], "printable_height": "280", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/SH65 IDRE COPY MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 IDRE COPY MODE (0.4 nozzle).json index bcd01d002f..a2006840fd 100644 --- a/resources/profiles/Volumic/machine/SH65 IDRE COPY MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 IDRE COPY MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "abcf94SvavkMYyFU", "name": "SH65 IDRE COPY MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "abcf94SvavkMYyFU", + "instantiation": "true", "printer_model": "SH65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x300" ], "printable_height": "280", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/SH65 IDRE MIRROR MODE (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 IDRE MIRROR MODE (0.4 nozzle).json index 72c8ab938d..0b28b9287b 100644 --- a/resources/profiles/Volumic/machine/SH65 IDRE MIRROR MODE (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 IDRE MIRROR MODE (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "xBbVrJNCzJO4egUE", "name": "SH65 IDRE MIRROR MODE (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "xBbVrJNCzJO4egUE", + "instantiation": "true", "printer_model": "SH65 IDRE", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -20,7 +20,10 @@ "11x300" ], "printable_height": "280", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine" + ], "auxiliary_fan": "0", "gcode_flavor": "klipper", "max_layer_height": [ @@ -31,24 +34,37 @@ ], "printer_variant": "0.4", "retraction_minimum_travel": [ + "1", "1" ], "retraction_length": [ + "2.4", "2.4" ], "retraction_speed": [ + "30", "30" ], "deretraction_speed": [ + "30", "30" ], "machine_max_acceleration_x": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", + "4500", + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", + "50", + "50", "50" ], "single_extruder_multi_material": [ diff --git a/resources/profiles/Volumic/machine/SH65 Performance (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 Performance (0.4 nozzle).json index 0163a27d65..e138bb5623 100644 --- a/resources/profiles/Volumic/machine/SH65 Performance (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 Performance (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "lmlG4rGxYKYkydUM", "name": "SH65 Performance (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "lmlG4rGxYKYkydUM", + "instantiation": "true", "printer_model": "SH65 Performance", "default_print_profile": "Performance 150 - 0.15mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/SH65 Stage 2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/SH65 Stage 2 (0.4 nozzle).json index 09c3802d10..7000359300 100644 --- a/resources/profiles/Volumic/machine/SH65 Stage 2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/SH65 Stage 2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "e3rpbhqZmSzuW5kA", "name": "SH65 Stage 2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "e3rpbhqZmSzuW5kA", + "instantiation": "true", "printer_model": "SH65 Stage 2", "default_print_profile": "Normal speed (Stage 2) - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/VS20MK2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS20MK2 (0.4 nozzle).json index 18f800df15..a7e9fa1e0e 100644 --- a/resources/profiles/Volumic/machine/VS20MK2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS20MK2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "xV2JznZ0imfZku62", "name": "VS20MK2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "xV2JznZ0imfZku62", + "instantiation": "true", "printer_model": "VS20MK2", "default_print_profile": "Compatible speed - 0.15mm", "nozzle_diameter": [ @@ -40,12 +40,15 @@ "25" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y199 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/VS30MK2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30MK2 (0.4 nozzle).json index e0c5195a1d..d3a905761f 100644 --- a/resources/profiles/Volumic/machine/VS30MK2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30MK2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "MnCC2SAgstB2WR50", "name": "VS30MK2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "MnCC2SAgstB2WR50", + "instantiation": "true", "printer_model": "VS30MK2", "default_print_profile": "Compatible speed - 0.15mm", "nozzle_diameter": [ @@ -40,12 +40,15 @@ "25" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y299 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/VS30MK3 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30MK3 (0.4 nozzle).json index 72924347a3..53caa7025d 100644 --- a/resources/profiles/Volumic/machine/VS30MK3 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30MK3 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "KFPbLwO3vQqIuJ34", "name": "VS30MK3 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "KFPbLwO3vQqIuJ34", + "instantiation": "true", "printer_model": "VS30MK3", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y299 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/VS30MK3 Stage 2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30MK3 Stage 2 (0.4 nozzle).json index d45f2a6b6b..9c4b1cac73 100644 --- a/resources/profiles/Volumic/machine/VS30MK3 Stage 2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30MK3 Stage 2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "XW58eNI9Y25FmAMR", "name": "VS30MK3 Stage 2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "XW58eNI9Y25FmAMR", + "instantiation": "true", "printer_model": "VS30MK3 Stage 2", "default_print_profile": "Normal speed (Stage 2) - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4000", "4000" ], "machine_max_acceleration_y": [ + "4000", "4000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/VS30SC (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30SC (0.4 nozzle).json index af49da615d..35d3c95fb8 100644 --- a/resources/profiles/Volumic/machine/VS30SC (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30SC (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "8HxzSP6HW9nOPphc", "name": "VS30SC (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "8HxzSP6HW9nOPphc", + "instantiation": "true", "printer_model": "VS30SC", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y199 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/VS30SC2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30SC2 (0.4 nozzle).json index 2e67106b5c..91a2619c97 100644 --- a/resources/profiles/Volumic/machine/VS30SC2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30SC2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "D9xXWUeeAAWmesfa", "name": "VS30SC2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "D9xXWUeeAAWmesfa", + "instantiation": "true", "printer_model": "VS30SC2", "default_print_profile": "Normal speed - 0.15mm", "host_type": "esp3d", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y199 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/machine/VS30SC2 Performance (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30SC2 Performance (0.4 nozzle).json index b2e9318337..ece1ffc74b 100644 --- a/resources/profiles/Volumic/machine/VS30SC2 Performance (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30SC2 Performance (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "PKKfRBEEc0CGbh45", "name": "VS30SC2 Performance (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "PKKfRBEEc0CGbh45", + "instantiation": "true", "printer_model": "VS30SC2 Performance", "default_print_profile": "Normal performance VS30 - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4500", "4500" ], "machine_max_acceleration_y": [ + "4500", "4500" ], "machine_max_acceleration_z": [ + "150", "150" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/VS30SC2 Stage 2 (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30SC2 Stage 2 (0.4 nozzle).json index 4d5fe68f1d..27ffffb74c 100644 --- a/resources/profiles/Volumic/machine/VS30SC2 Stage 2 (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30SC2 Stage 2 (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "2RWMRzJILLpB2W3V", "name": "VS30SC2 Stage 2 (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "2RWMRzJILLpB2W3V", + "instantiation": "true", "printer_model": "VS30SC2 Stage 2", "default_print_profile": "Normal speed (Stage 2) - 0.20mm", "host_type": "octoprint", @@ -42,12 +42,15 @@ "30" ], "machine_max_acceleration_x": [ + "4000", "4000" ], "machine_max_acceleration_y": [ + "4000", "4000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]", diff --git a/resources/profiles/Volumic/machine/VS30ULTRA (0.4 nozzle).json b/resources/profiles/Volumic/machine/VS30ULTRA (0.4 nozzle).json index a7ed6be9ac..b0d0774360 100644 --- a/resources/profiles/Volumic/machine/VS30ULTRA (0.4 nozzle).json +++ b/resources/profiles/Volumic/machine/VS30ULTRA (0.4 nozzle).json @@ -1,10 +1,10 @@ { "type": "machine", - "setting_id": "IZzmiYZXK5UBri4z", "name": "VS30ULTRA (0.4 nozzle)", - "from": "system", - "instantiation": "true", "inherits": "fdm_volumic_common", + "from": "system", + "setting_id": "IZzmiYZXK5UBri4z", + "instantiation": "true", "printer_model": "VS30ULTRA", "default_print_profile": "Normal speed - 0.15mm", "nozzle_diameter": [ @@ -40,12 +40,15 @@ "30" ], "machine_max_acceleration_x": [ + "2000", "2000" ], "machine_max_acceleration_y": [ + "2000", "2000" ], "machine_max_acceleration_z": [ + "50", "50" ], "machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y199 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression", diff --git a/resources/profiles/Volumic/process/Compatible speed - 0.10mm.json b/resources/profiles/Volumic/process/Compatible speed - 0.10mm.json index 0dfce3935f..0412c8baa0 100644 --- a/resources/profiles/Volumic/process/Compatible speed - 0.10mm.json +++ b/resources/profiles/Volumic/process/Compatible speed - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "0Gwgv9G1arp0ufdp", "name": "Compatible speed - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "0Gwgv9G1arp0ufdp", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Compatible speed - 0.15mm.json b/resources/profiles/Volumic/process/Compatible speed - 0.15mm.json index e8745de20f..ae7529e735 100644 --- a/resources/profiles/Volumic/process/Compatible speed - 0.15mm.json +++ b/resources/profiles/Volumic/process/Compatible speed - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Tp9t0BQZKkxCA8qZ", "name": "Compatible speed - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Tp9t0BQZKkxCA8qZ", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Compatible speed - 0.20mm.json b/resources/profiles/Volumic/process/Compatible speed - 0.20mm.json index 0e8644aa73..51faa259dd 100644 --- a/resources/profiles/Volumic/process/Compatible speed - 0.20mm.json +++ b/resources/profiles/Volumic/process/Compatible speed - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "z3fSJ5Y0JuhRQhOU", "name": "Compatible speed - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "z3fSJ5Y0JuhRQhOU", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Compatible speed - 0.25mm.json b/resources/profiles/Volumic/process/Compatible speed - 0.25mm.json index 28f94dda2c..3c90d17bf3 100644 --- a/resources/profiles/Volumic/process/Compatible speed - 0.25mm.json +++ b/resources/profiles/Volumic/process/Compatible speed - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "hfNxq9KnwJlS0gcr", "name": "Compatible speed - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "hfNxq9KnwJlS0gcr", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Compatible speed - 0.30mm.json b/resources/profiles/Volumic/process/Compatible speed - 0.30mm.json index 9f6d1ecb48..82334c0c28 100644 --- a/resources/profiles/Volumic/process/Compatible speed - 0.30mm.json +++ b/resources/profiles/Volumic/process/Compatible speed - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Pdg0wxAaJS0SR8AF", "name": "Compatible speed - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Pdg0wxAaJS0SR8AF", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Full performance - 0.10mm.json b/resources/profiles/Volumic/process/Full performance - 0.10mm.json index e672435e53..815eba6e85 100644 --- a/resources/profiles/Volumic/process/Full performance - 0.10mm.json +++ b/resources/profiles/Volumic/process/Full performance - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "BdckjC9G0PLHCMgf", "name": "Full performance - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "BdckjC9G0PLHCMgf", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Full performance - 0.15mm.json b/resources/profiles/Volumic/process/Full performance - 0.15mm.json index 71ca39fbab..654ca1a8e4 100644 --- a/resources/profiles/Volumic/process/Full performance - 0.15mm.json +++ b/resources/profiles/Volumic/process/Full performance - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "fx3iCV7mYY4FYrci", "name": "Full performance - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "fx3iCV7mYY4FYrci", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Full performance - 0.20mm.json b/resources/profiles/Volumic/process/Full performance - 0.20mm.json index 8834a822f0..d483ff14a7 100644 --- a/resources/profiles/Volumic/process/Full performance - 0.20mm.json +++ b/resources/profiles/Volumic/process/Full performance - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "vjm5CwY9lx6DOJZy", "name": "Full performance - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "vjm5CwY9lx6DOJZy", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Full performance - 0.25mm.json b/resources/profiles/Volumic/process/Full performance - 0.25mm.json index e977f22c25..67960e7751 100644 --- a/resources/profiles/Volumic/process/Full performance - 0.25mm.json +++ b/resources/profiles/Volumic/process/Full performance - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "q3EqyOZ87HZpBzvO", "name": "Full performance - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "q3EqyOZ87HZpBzvO", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Full performance - 0.30mm.json b/resources/profiles/Volumic/process/Full performance - 0.30mm.json index 8df0793a6a..e1fb5b97c2 100644 --- a/resources/profiles/Volumic/process/Full performance - 0.30mm.json +++ b/resources/profiles/Volumic/process/Full performance - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "EG1g0ef96ojgMo8K", "name": "Full performance - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "EG1g0ef96ojgMo8K", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Full performance DUAL - 0.10mm.json b/resources/profiles/Volumic/process/Full performance DUAL - 0.10mm.json index f58e4f6d66..3260c8d11c 100644 --- a/resources/profiles/Volumic/process/Full performance DUAL - 0.10mm.json +++ b/resources/profiles/Volumic/process/Full performance DUAL - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "WtBzcQwLoYPoNDbM", "name": "Full performance DUAL - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "WtBzcQwLoYPoNDbM", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Full performance DUAL - 0.15mm.json b/resources/profiles/Volumic/process/Full performance DUAL - 0.15mm.json index 90eceadcdb..a28a086055 100644 --- a/resources/profiles/Volumic/process/Full performance DUAL - 0.15mm.json +++ b/resources/profiles/Volumic/process/Full performance DUAL - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "QwgTvSeq1hLKGILo", "name": "Full performance DUAL - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "QwgTvSeq1hLKGILo", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Full performance DUAL - 0.20mm.json b/resources/profiles/Volumic/process/Full performance DUAL - 0.20mm.json index 8d674fa854..12b5e40946 100644 --- a/resources/profiles/Volumic/process/Full performance DUAL - 0.20mm.json +++ b/resources/profiles/Volumic/process/Full performance DUAL - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "BKpizWAIMDwwSaTu", "name": "Full performance DUAL - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "BKpizWAIMDwwSaTu", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Full performance DUAL - 0.25mm.json b/resources/profiles/Volumic/process/Full performance DUAL - 0.25mm.json index 586bc7220c..bfefd96ad8 100644 --- a/resources/profiles/Volumic/process/Full performance DUAL - 0.25mm.json +++ b/resources/profiles/Volumic/process/Full performance DUAL - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Oua2iEIMKavdJVHY", "name": "Full performance DUAL - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Oua2iEIMKavdJVHY", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Full performance DUAL - 0.30mm.json b/resources/profiles/Volumic/process/Full performance DUAL - 0.30mm.json index 915ac0527e..a90ed43159 100644 --- a/resources/profiles/Volumic/process/Full performance DUAL - 0.30mm.json +++ b/resources/profiles/Volumic/process/Full performance DUAL - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "W8bDRq0EMAasHC0C", "name": "Full performance DUAL - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "W8bDRq0EMAasHC0C", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Full performance VS30 - 0.10mm.json b/resources/profiles/Volumic/process/Full performance VS30 - 0.10mm.json index 4d6bba2889..ed305c1bf2 100644 --- a/resources/profiles/Volumic/process/Full performance VS30 - 0.10mm.json +++ b/resources/profiles/Volumic/process/Full performance VS30 - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "n3LCfOd6MlXqSaFM", "name": "Full performance VS30 - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "n3LCfOd6MlXqSaFM", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Full performance VS30 - 0.15mm.json b/resources/profiles/Volumic/process/Full performance VS30 - 0.15mm.json index f745a7d476..200ed5392d 100644 --- a/resources/profiles/Volumic/process/Full performance VS30 - 0.15mm.json +++ b/resources/profiles/Volumic/process/Full performance VS30 - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "WJxmd7QtAlD99oWO", "name": "Full performance VS30 - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "WJxmd7QtAlD99oWO", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Full performance VS30 - 0.20mm.json b/resources/profiles/Volumic/process/Full performance VS30 - 0.20mm.json index 9f6e156e04..701e10a173 100644 --- a/resources/profiles/Volumic/process/Full performance VS30 - 0.20mm.json +++ b/resources/profiles/Volumic/process/Full performance VS30 - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "6O8V3laqfmS31DpL", "name": "Full performance VS30 - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "6O8V3laqfmS31DpL", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Full performance VS30 - 0.25mm.json b/resources/profiles/Volumic/process/Full performance VS30 - 0.25mm.json index a10387ee11..213b48ff7a 100644 --- a/resources/profiles/Volumic/process/Full performance VS30 - 0.25mm.json +++ b/resources/profiles/Volumic/process/Full performance VS30 - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "q5Df9Zk0bBsl6tgn", "name": "Full performance VS30 - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "q5Df9Zk0bBsl6tgn", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Full performance VS30 - 0.30mm.json b/resources/profiles/Volumic/process/Full performance VS30 - 0.30mm.json index b642805e57..25ed597749 100644 --- a/resources/profiles/Volumic/process/Full performance VS30 - 0.30mm.json +++ b/resources/profiles/Volumic/process/Full performance VS30 - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "4xhjCaz0oSdj4dmz", "name": "Full performance VS30 - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "4xhjCaz0oSdj4dmz", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/High performance - 0.10mm.json b/resources/profiles/Volumic/process/High performance - 0.10mm.json index 5897a066ec..904fdafe90 100644 --- a/resources/profiles/Volumic/process/High performance - 0.10mm.json +++ b/resources/profiles/Volumic/process/High performance - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "gkRJ4aBb8nYiWWkQ", "name": "High performance - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "gkRJ4aBb8nYiWWkQ", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/High performance - 0.15mm.json b/resources/profiles/Volumic/process/High performance - 0.15mm.json index a0d2b72904..bd69845550 100644 --- a/resources/profiles/Volumic/process/High performance - 0.15mm.json +++ b/resources/profiles/Volumic/process/High performance - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "tZ9EVpNMRCnEh4QD", "name": "High performance - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "tZ9EVpNMRCnEh4QD", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/High performance - 0.20mm.json b/resources/profiles/Volumic/process/High performance - 0.20mm.json index d021e40286..d54872d1e0 100644 --- a/resources/profiles/Volumic/process/High performance - 0.20mm.json +++ b/resources/profiles/Volumic/process/High performance - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "yCDzVcIWjVgIyIRH", "name": "High performance - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "yCDzVcIWjVgIyIRH", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/High performance - 0.25mm.json b/resources/profiles/Volumic/process/High performance - 0.25mm.json index 87b210962c..3afdc4d88e 100644 --- a/resources/profiles/Volumic/process/High performance - 0.25mm.json +++ b/resources/profiles/Volumic/process/High performance - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "x0Q3hHsXoY33V4Df", "name": "High performance - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "x0Q3hHsXoY33V4Df", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/High performance - 0.30mm.json b/resources/profiles/Volumic/process/High performance - 0.30mm.json index 2a9f73d564..37f878eaa0 100644 --- a/resources/profiles/Volumic/process/High performance - 0.30mm.json +++ b/resources/profiles/Volumic/process/High performance - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "wtWZKy5RUZxBEKiA", "name": "High performance - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "wtWZKy5RUZxBEKiA", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/High performance DUAL - 0.10mm.json b/resources/profiles/Volumic/process/High performance DUAL - 0.10mm.json index b8615a5a79..0df99510d2 100644 --- a/resources/profiles/Volumic/process/High performance DUAL - 0.10mm.json +++ b/resources/profiles/Volumic/process/High performance DUAL - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "AQxzb91WKNnqyR4m", "name": "High performance DUAL - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "AQxzb91WKNnqyR4m", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/High performance DUAL - 0.15mm.json b/resources/profiles/Volumic/process/High performance DUAL - 0.15mm.json index aac928ed9e..91e8ac1d00 100644 --- a/resources/profiles/Volumic/process/High performance DUAL - 0.15mm.json +++ b/resources/profiles/Volumic/process/High performance DUAL - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "L4Ok3bi0ZUYayKei", "name": "High performance DUAL - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "L4Ok3bi0ZUYayKei", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/High performance DUAL - 0.20mm.json b/resources/profiles/Volumic/process/High performance DUAL - 0.20mm.json index 820c72f251..75b896c99b 100644 --- a/resources/profiles/Volumic/process/High performance DUAL - 0.20mm.json +++ b/resources/profiles/Volumic/process/High performance DUAL - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "VzveNihkhzpEd8YX", "name": "High performance DUAL - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "VzveNihkhzpEd8YX", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/High performance DUAL - 0.25mm.json b/resources/profiles/Volumic/process/High performance DUAL - 0.25mm.json index 48f0784784..fa0cb751ac 100644 --- a/resources/profiles/Volumic/process/High performance DUAL - 0.25mm.json +++ b/resources/profiles/Volumic/process/High performance DUAL - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "SH11Eth4ecxaSafR", "name": "High performance DUAL - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "SH11Eth4ecxaSafR", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/High performance DUAL - 0.30mm.json b/resources/profiles/Volumic/process/High performance DUAL - 0.30mm.json index 9129a45457..5cce5309cd 100644 --- a/resources/profiles/Volumic/process/High performance DUAL - 0.30mm.json +++ b/resources/profiles/Volumic/process/High performance DUAL - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Rheh3fgJfFugxKZL", "name": "High performance DUAL - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Rheh3fgJfFugxKZL", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/High performance VS30 - 0.10mm.json b/resources/profiles/Volumic/process/High performance VS30 - 0.10mm.json index 3b458847e5..590a01dc87 100644 --- a/resources/profiles/Volumic/process/High performance VS30 - 0.10mm.json +++ b/resources/profiles/Volumic/process/High performance VS30 - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "nfaAKkhQ6yt2AC7o", "name": "High performance VS30 - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "nfaAKkhQ6yt2AC7o", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/High performance VS30 - 0.15mm.json b/resources/profiles/Volumic/process/High performance VS30 - 0.15mm.json index fd5e05ef6f..d4c32db171 100644 --- a/resources/profiles/Volumic/process/High performance VS30 - 0.15mm.json +++ b/resources/profiles/Volumic/process/High performance VS30 - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Eb3wJrmzg2nzEwAm", "name": "High performance VS30 - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Eb3wJrmzg2nzEwAm", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/High performance VS30 - 0.20mm.json b/resources/profiles/Volumic/process/High performance VS30 - 0.20mm.json index 34369239bc..4832e76664 100644 --- a/resources/profiles/Volumic/process/High performance VS30 - 0.20mm.json +++ b/resources/profiles/Volumic/process/High performance VS30 - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "qWEOT65KoPG51AJW", "name": "High performance VS30 - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "qWEOT65KoPG51AJW", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/High performance VS30 - 0.25mm.json b/resources/profiles/Volumic/process/High performance VS30 - 0.25mm.json index 969f1daa28..12412183e9 100644 --- a/resources/profiles/Volumic/process/High performance VS30 - 0.25mm.json +++ b/resources/profiles/Volumic/process/High performance VS30 - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Co6sQp00KLUD50WN", "name": "High performance VS30 - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Co6sQp00KLUD50WN", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/High performance VS30 - 0.30mm.json b/resources/profiles/Volumic/process/High performance VS30 - 0.30mm.json index 147e0cd217..82052d7055 100644 --- a/resources/profiles/Volumic/process/High performance VS30 - 0.30mm.json +++ b/resources/profiles/Volumic/process/High performance VS30 - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "3qVuLHagvoHBu2yP", "name": "High performance VS30 - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "3qVuLHagvoHBu2yP", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.10mm.json b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.10mm.json index 3fbe07956d..f0b2f6883d 100644 --- a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.10mm.json +++ b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "3vksM99YF7pwEP3G", "name": "High speed (Stage 2) - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "3vksM99YF7pwEP3G", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.15mm.json b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.15mm.json index 7a4313160a..816c6a4db1 100644 --- a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.15mm.json +++ b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "9k0mROwMyk1hxZm1", "name": "High speed (Stage 2) - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "9k0mROwMyk1hxZm1", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.20mm.json b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.20mm.json index 91d998c170..78b4f5304c 100644 --- a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.20mm.json +++ b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "s7GVelf1PDb0Qy9g", "name": "High speed (Stage 2) - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "s7GVelf1PDb0Qy9g", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.25mm.json b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.25mm.json index a3277f67a7..d4f6bb4fcf 100644 --- a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.25mm.json +++ b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Kxk9C4GtJ5tiwqes", "name": "High speed (Stage 2) - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Kxk9C4GtJ5tiwqes", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.30mm.json b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.30mm.json index 76bfe21286..5f92ab82ab 100644 --- a/resources/profiles/Volumic/process/High speed (Stage 2) - 0.30mm.json +++ b/resources/profiles/Volumic/process/High speed (Stage 2) - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ireCZVAGHWDUN03m", "name": "High speed (Stage 2) - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "ireCZVAGHWDUN03m", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/High speed - 0.10mm.json b/resources/profiles/Volumic/process/High speed - 0.10mm.json index c86d7535c0..23af87c00a 100644 --- a/resources/profiles/Volumic/process/High speed - 0.10mm.json +++ b/resources/profiles/Volumic/process/High speed - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ClExqnoYEdZmnnOX", "name": "High speed - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "ClExqnoYEdZmnnOX", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/High speed - 0.15mm.json b/resources/profiles/Volumic/process/High speed - 0.15mm.json index 0e3da3a700..5591b5ce93 100644 --- a/resources/profiles/Volumic/process/High speed - 0.15mm.json +++ b/resources/profiles/Volumic/process/High speed - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Wk6UnqxF8mQm9sE6", "name": "High speed - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Wk6UnqxF8mQm9sE6", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/High speed - 0.20mm.json b/resources/profiles/Volumic/process/High speed - 0.20mm.json index c37503c724..73bd79c338 100644 --- a/resources/profiles/Volumic/process/High speed - 0.20mm.json +++ b/resources/profiles/Volumic/process/High speed - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "72tWDDDqVKtRwBFH", "name": "High speed - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "72tWDDDqVKtRwBFH", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/High speed - 0.25mm.json b/resources/profiles/Volumic/process/High speed - 0.25mm.json index 10286f7196..9013811c1a 100644 --- a/resources/profiles/Volumic/process/High speed - 0.25mm.json +++ b/resources/profiles/Volumic/process/High speed - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Qx4TTWaVVzXqRCJ4", "name": "High speed - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Qx4TTWaVVzXqRCJ4", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/High speed - 0.30mm.json b/resources/profiles/Volumic/process/High speed - 0.30mm.json index abc18e3fc1..ddd88376d5 100644 --- a/resources/profiles/Volumic/process/High speed - 0.30mm.json +++ b/resources/profiles/Volumic/process/High speed - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "6h7mK5XKws51vPov", "name": "High speed - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "6h7mK5XKws51vPov", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Normal performance - 0.10mm.json b/resources/profiles/Volumic/process/Normal performance - 0.10mm.json index 7bc3240b5e..82c8f70bbf 100644 --- a/resources/profiles/Volumic/process/Normal performance - 0.10mm.json +++ b/resources/profiles/Volumic/process/Normal performance - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "FTqjZjQPPR7L9pO1", "name": "Normal performance - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "FTqjZjQPPR7L9pO1", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Normal performance - 0.15mm.json b/resources/profiles/Volumic/process/Normal performance - 0.15mm.json index a274e1263a..9dc7c991a2 100644 --- a/resources/profiles/Volumic/process/Normal performance - 0.15mm.json +++ b/resources/profiles/Volumic/process/Normal performance - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "JY670KAkuqNKq1pD", "name": "Normal performance - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "JY670KAkuqNKq1pD", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Normal performance - 0.20mm.json b/resources/profiles/Volumic/process/Normal performance - 0.20mm.json index e03c5bdafd..db61c2882a 100644 --- a/resources/profiles/Volumic/process/Normal performance - 0.20mm.json +++ b/resources/profiles/Volumic/process/Normal performance - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "6xUkj1ATyvZ9n69E", "name": "Normal performance - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "6xUkj1ATyvZ9n69E", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Normal performance - 0.25mm.json b/resources/profiles/Volumic/process/Normal performance - 0.25mm.json index 3b1db4b002..6c23dde43c 100644 --- a/resources/profiles/Volumic/process/Normal performance - 0.25mm.json +++ b/resources/profiles/Volumic/process/Normal performance - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "J2ZwCE8TcdUDJy9u", "name": "Normal performance - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "J2ZwCE8TcdUDJy9u", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Normal performance - 0.30mm.json b/resources/profiles/Volumic/process/Normal performance - 0.30mm.json index b75c0433c3..5e1d299bfd 100644 --- a/resources/profiles/Volumic/process/Normal performance - 0.30mm.json +++ b/resources/profiles/Volumic/process/Normal performance - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "TikIASel3dJuzlIC", "name": "Normal performance - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "TikIASel3dJuzlIC", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Normal performance DUAL - 0.10mm.json b/resources/profiles/Volumic/process/Normal performance DUAL - 0.10mm.json index 2fdfb80a54..b5d4a6e280 100644 --- a/resources/profiles/Volumic/process/Normal performance DUAL - 0.10mm.json +++ b/resources/profiles/Volumic/process/Normal performance DUAL - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "CPvAoewpDOyAUZzz", "name": "Normal performance DUAL - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "CPvAoewpDOyAUZzz", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Normal performance DUAL - 0.15mm.json b/resources/profiles/Volumic/process/Normal performance DUAL - 0.15mm.json index b231cbe91b..0e9afca6d9 100644 --- a/resources/profiles/Volumic/process/Normal performance DUAL - 0.15mm.json +++ b/resources/profiles/Volumic/process/Normal performance DUAL - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "lxzarnB1H22cOqIl", "name": "Normal performance DUAL - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "lxzarnB1H22cOqIl", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Normal performance DUAL - 0.20mm.json b/resources/profiles/Volumic/process/Normal performance DUAL - 0.20mm.json index bed3e748ab..5155807f9c 100644 --- a/resources/profiles/Volumic/process/Normal performance DUAL - 0.20mm.json +++ b/resources/profiles/Volumic/process/Normal performance DUAL - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "GNPkW4cAsenc06Qj", "name": "Normal performance DUAL - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "GNPkW4cAsenc06Qj", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Normal performance DUAL - 0.25mm.json b/resources/profiles/Volumic/process/Normal performance DUAL - 0.25mm.json index 87596fc890..680cce596f 100644 --- a/resources/profiles/Volumic/process/Normal performance DUAL - 0.25mm.json +++ b/resources/profiles/Volumic/process/Normal performance DUAL - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "VvM6yKMGis2PyNHn", "name": "Normal performance DUAL - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "VvM6yKMGis2PyNHn", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Normal performance DUAL - 0.30mm.json b/resources/profiles/Volumic/process/Normal performance DUAL - 0.30mm.json index a389180199..b57cddff40 100644 --- a/resources/profiles/Volumic/process/Normal performance DUAL - 0.30mm.json +++ b/resources/profiles/Volumic/process/Normal performance DUAL - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ouPv4ZnFRqBIZTUQ", "name": "Normal performance DUAL - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "ouPv4ZnFRqBIZTUQ", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Normal performance VS30 - 0.10mm.json b/resources/profiles/Volumic/process/Normal performance VS30 - 0.10mm.json index fb120c03a5..6ad5f4ee3c 100644 --- a/resources/profiles/Volumic/process/Normal performance VS30 - 0.10mm.json +++ b/resources/profiles/Volumic/process/Normal performance VS30 - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "A1MeH5DTrbaapIvs", "name": "Normal performance VS30 - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "A1MeH5DTrbaapIvs", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Normal performance VS30 - 0.15mm.json b/resources/profiles/Volumic/process/Normal performance VS30 - 0.15mm.json index b95abd904f..c98275fcdc 100644 --- a/resources/profiles/Volumic/process/Normal performance VS30 - 0.15mm.json +++ b/resources/profiles/Volumic/process/Normal performance VS30 - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "RN31YrQ3X4sAgRji", "name": "Normal performance VS30 - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "RN31YrQ3X4sAgRji", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Normal performance VS30 - 0.20mm.json b/resources/profiles/Volumic/process/Normal performance VS30 - 0.20mm.json index 0657825c7b..067e282f0b 100644 --- a/resources/profiles/Volumic/process/Normal performance VS30 - 0.20mm.json +++ b/resources/profiles/Volumic/process/Normal performance VS30 - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "pW9nom8pyi48XeOB", "name": "Normal performance VS30 - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "pW9nom8pyi48XeOB", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Normal performance VS30 - 0.25mm.json b/resources/profiles/Volumic/process/Normal performance VS30 - 0.25mm.json index 0197bc775d..993043650d 100644 --- a/resources/profiles/Volumic/process/Normal performance VS30 - 0.25mm.json +++ b/resources/profiles/Volumic/process/Normal performance VS30 - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "O4mCyYEDLcYs9ksp", "name": "Normal performance VS30 - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "O4mCyYEDLcYs9ksp", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Normal performance VS30 - 0.30mm.json b/resources/profiles/Volumic/process/Normal performance VS30 - 0.30mm.json index 5f8a81f236..adf0a49d37 100644 --- a/resources/profiles/Volumic/process/Normal performance VS30 - 0.30mm.json +++ b/resources/profiles/Volumic/process/Normal performance VS30 - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Wl53R1wiaRjXyP4m", "name": "Normal performance VS30 - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Wl53R1wiaRjXyP4m", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.10mm.json b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.10mm.json index 7a4cca2086..fe50dbb494 100644 --- a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.10mm.json +++ b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "tc9ZLzQlKlARHNGw", "name": "Normal speed (Stage 2) - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "tc9ZLzQlKlARHNGw", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.15mm.json b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.15mm.json index 1b3bdfd473..832a7c9fde 100644 --- a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.15mm.json +++ b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "SIjHUj1PwWkFFffa", "name": "Normal speed (Stage 2) - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "SIjHUj1PwWkFFffa", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.20mm.json b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.20mm.json index 789a59c8e7..19e23678d4 100644 --- a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.20mm.json +++ b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "M0E4QeWLUVdWUHfJ", "name": "Normal speed (Stage 2) - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "M0E4QeWLUVdWUHfJ", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.25mm.json b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.25mm.json index 6b1a0c5fe3..98598db38c 100644 --- a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.25mm.json +++ b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "7RRVQg0tShBy6Xuj", "name": "Normal speed (Stage 2) - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "7RRVQg0tShBy6Xuj", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.30mm.json b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.30mm.json index 0243eff1b9..eb41b3f307 100644 --- a/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.30mm.json +++ b/resources/profiles/Volumic/process/Normal speed (Stage 2) - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "VeLRxlpx80B0fAVO", "name": "Normal speed (Stage 2) - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "VeLRxlpx80B0fAVO", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Normal speed - 0.10mm.json b/resources/profiles/Volumic/process/Normal speed - 0.10mm.json index 475b8436ca..4340058a3c 100644 --- a/resources/profiles/Volumic/process/Normal speed - 0.10mm.json +++ b/resources/profiles/Volumic/process/Normal speed - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "KYuX2erMe0Qnjqig", "name": "Normal speed - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "KYuX2erMe0Qnjqig", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Normal speed - 0.15mm.json b/resources/profiles/Volumic/process/Normal speed - 0.15mm.json index 5ee0b65a91..d66b440c70 100644 --- a/resources/profiles/Volumic/process/Normal speed - 0.15mm.json +++ b/resources/profiles/Volumic/process/Normal speed - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ulLTG505AlCQyOVT", "name": "Normal speed - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "ulLTG505AlCQyOVT", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Normal speed - 0.20mm.json b/resources/profiles/Volumic/process/Normal speed - 0.20mm.json index 18f07ba295..338f88e5ec 100644 --- a/resources/profiles/Volumic/process/Normal speed - 0.20mm.json +++ b/resources/profiles/Volumic/process/Normal speed - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "5VK09EV5nZFZ8tDX", "name": "Normal speed - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "5VK09EV5nZFZ8tDX", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Normal speed - 0.25mm.json b/resources/profiles/Volumic/process/Normal speed - 0.25mm.json index a0400b22e5..fa82c4e443 100644 --- a/resources/profiles/Volumic/process/Normal speed - 0.25mm.json +++ b/resources/profiles/Volumic/process/Normal speed - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "sKsaHEmeYNos7Ap3", "name": "Normal speed - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "sKsaHEmeYNos7Ap3", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Normal speed - 0.30mm.json b/resources/profiles/Volumic/process/Normal speed - 0.30mm.json index 227cda5c1e..755f8d5297 100644 --- a/resources/profiles/Volumic/process/Normal speed - 0.30mm.json +++ b/resources/profiles/Volumic/process/Normal speed - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "fLtovREOpasPunPM", "name": "Normal speed - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "fLtovREOpasPunPM", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.10mm.json b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.10mm.json index d80d3230e4..89c5d317b7 100644 --- a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.10mm.json +++ b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "v29Kc1X5AEVhYRk8", "name": "Very high speed (Stage 2) - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "v29Kc1X5AEVhYRk8", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.15mm.json b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.15mm.json index fea250b867..b7e8ef3198 100644 --- a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.15mm.json +++ b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "IFk4SdxdsDe9XHA7", "name": "Very high speed (Stage 2) - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "IFk4SdxdsDe9XHA7", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.20mm.json b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.20mm.json index b308dbbf7e..b72013724a 100644 --- a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.20mm.json +++ b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "rnRfy0wN7TWGyq6y", "name": "Very high speed (Stage 2) - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "rnRfy0wN7TWGyq6y", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.25mm.json b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.25mm.json index 004cc14719..230c508040 100644 --- a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.25mm.json +++ b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Trb33VeRJfEhjvyw", "name": "Very high speed (Stage 2) - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Trb33VeRJfEhjvyw", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.30mm.json b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.30mm.json index b5225c859e..fa1030d684 100644 --- a/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.30mm.json +++ b/resources/profiles/Volumic/process/Very high speed (Stage 2) - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "A7yh9LBPEQ0kX3w4", "name": "Very high speed (Stage 2) - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "A7yh9LBPEQ0kX3w4", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Volumic/process/Very high speed - 0.10mm.json b/resources/profiles/Volumic/process/Very high speed - 0.10mm.json index 1b1e9c9108..e17dc83210 100644 --- a/resources/profiles/Volumic/process/Very high speed - 0.10mm.json +++ b/resources/profiles/Volumic/process/Very high speed - 0.10mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "ZqsUCKAhvogcqdcv", "name": "Very high speed - 0.10mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "ZqsUCKAhvogcqdcv", "instantiation": "true", "layer_height": "0.1", "initial_layer_print_height": "0.1", diff --git a/resources/profiles/Volumic/process/Very high speed - 0.15mm.json b/resources/profiles/Volumic/process/Very high speed - 0.15mm.json index 7e657c6498..5dda960dd4 100644 --- a/resources/profiles/Volumic/process/Very high speed - 0.15mm.json +++ b/resources/profiles/Volumic/process/Very high speed - 0.15mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "Ept7P07GPaZjDkH1", "name": "Very high speed - 0.15mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "Ept7P07GPaZjDkH1", "instantiation": "true", "layer_height": "0.15", "initial_layer_print_height": "0.15", diff --git a/resources/profiles/Volumic/process/Very high speed - 0.20mm.json b/resources/profiles/Volumic/process/Very high speed - 0.20mm.json index 5f12b90d5e..57e3372edb 100644 --- a/resources/profiles/Volumic/process/Very high speed - 0.20mm.json +++ b/resources/profiles/Volumic/process/Very high speed - 0.20mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "1I77SBl6Oe7z8QVf", "name": "Very high speed - 0.20mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "1I77SBl6Oe7z8QVf", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", diff --git a/resources/profiles/Volumic/process/Very high speed - 0.25mm.json b/resources/profiles/Volumic/process/Very high speed - 0.25mm.json index eede1a2bf3..41ff717f9c 100644 --- a/resources/profiles/Volumic/process/Very high speed - 0.25mm.json +++ b/resources/profiles/Volumic/process/Very high speed - 0.25mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "qy4K1ha3a6cbW0sw", "name": "Very high speed - 0.25mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "qy4K1ha3a6cbW0sw", "instantiation": "true", "layer_height": "0.25", "initial_layer_print_height": "0.25", diff --git a/resources/profiles/Volumic/process/Very high speed - 0.30mm.json b/resources/profiles/Volumic/process/Very high speed - 0.30mm.json index b6148c6aa6..2f34c6107d 100644 --- a/resources/profiles/Volumic/process/Very high speed - 0.30mm.json +++ b/resources/profiles/Volumic/process/Very high speed - 0.30mm.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "4up2FChqWIEn6vYl", "name": "Very high speed - 0.30mm", - "from": "system", "inherits": "fdm_process_volumic_common", + "from": "system", + "setting_id": "4up2FChqWIEn6vYl", "instantiation": "true", "layer_height": "0.3", "initial_layer_print_height": "0.3", diff --git a/resources/profiles/Vzbot.json b/resources/profiles/Vzbot.json index a64b4807e8..04e239ed45 100644 --- a/resources/profiles/Vzbot.json +++ b/resources/profiles/Vzbot.json @@ -1,6 +1,6 @@ { "name": "Vzbot", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Vzbot configurations", "machine_model_list": [ diff --git a/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json b/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json index bc59bdfea7..0fe03d3148 100644 --- a/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Vzbot", - "inherits": "fdm_filament_abs", "renamed_from": "Vzbot Generic ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0gr3MwdhoGW44mbr", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json b/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json index 9495f5cb1e..4341eb7b9a 100644 --- a/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ASA @Vzbot", - "inherits": "fdm_filament_asa", "renamed_from": "Vzbot Generic ASA", + "inherits": "fdm_filament_asa", "from": "system", "setting_id": "0MutZpaR9XVzUGGS", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json index a5e39c829c..db0e5fcca0 100644 --- a/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Vzbot", - "inherits": "fdm_filament_pa", "renamed_from": "Vzbot Generic PA", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "fwiU6RaIAOV38A9B", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json index 30a13910e0..3dba44eea0 100644 --- a/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA-CF @Vzbot", - "inherits": "fdm_filament_pa", "renamed_from": "Vzbot Generic PA-CF", + "inherits": "fdm_filament_pa", "from": "system", "setting_id": "q8DtJmdJUN3KFV3E", "filament_id": "OFQLcbps", diff --git a/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json index e2fecd6301..bcb2a6e11e 100644 --- a/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PC @Vzbot", - "inherits": "fdm_filament_pc", "renamed_from": "Vzbot Generic PC", + "inherits": "fdm_filament_pc", "from": "system", "setting_id": "crcoB7BvhVnnHNaF", "filament_id": "OFLakOUI", diff --git a/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json index bfb1f5af81..753b2816a3 100644 --- a/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Vzbot", - "inherits": "fdm_filament_pet", "renamed_from": "Vzbot Generic PETG", + "inherits": "fdm_filament_pet", "from": "system", "setting_id": "NInr0jEJnziZ1poM", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json index ee77c2fd61..1953b3353f 100644 --- a/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Vzbot", - "inherits": "fdm_filament_pla", "renamed_from": "Vzbot Generic PLA", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Skn1ODpcSXd2NFcH", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json index 2fd8b03ee5..5b62fb3c69 100644 --- a/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA-CF @Vzbot", - "inherits": "fdm_filament_pla", "renamed_from": "Vzbot Generic PLA-CF", + "inherits": "fdm_filament_pla", "from": "system", "setting_id": "FETpZHhHj60hztGS", "filament_id": "OFWbdGsC", diff --git a/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json b/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json index f8b6793e74..fb81783434 100644 --- a/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PVA @Vzbot", - "inherits": "fdm_filament_pva", "renamed_from": "Vzbot Generic PVA", + "inherits": "fdm_filament_pva", "from": "system", "setting_id": "3xgrPw1nCEUaKQwQ", "filament_id": "OFDvXujf", diff --git a/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json b/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json index 6ba3a3e9e4..5b705e9be6 100644 --- a/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json +++ b/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic TPU @Vzbot", - "inherits": "fdm_filament_tpu", "renamed_from": "Vzbot Generic TPU", + "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "eC3Pgdpbwi2amDbk", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/WEMAKE3D.json b/resources/profiles/WEMAKE3D.json index feeeba132b..197bf820dd 100644 --- a/resources/profiles/WEMAKE3D.json +++ b/resources/profiles/WEMAKE3D.json @@ -1,6 +1,6 @@ { "name": "WEMAKE3D", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "WEMAKE3D configurations", "machine_model_list": [ diff --git a/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1 0.2mm nozzle.json b/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1 0.2mm nozzle.json index c83afd8d4b..8943d7551c 100644 --- a/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1 0.2mm nozzle.json +++ b/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1 0.2mm nozzle.json @@ -3,8 +3,8 @@ "name": "WEMAKE3D PhoenixProV1 0.2mm nozzle", "inherits": "fdm_machine_phoenixprov1_common", "from": "system", - "instantiation": "true", "setting_id": "XHK731uBkstR3hRp", + "instantiation": "true", "printer_model": "WEMAKE3D PhoenixProV1", "nozzle_diameter": [ "0.2" diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT 0.4 nozzle.json index 865bad7e88..bcac8171fb 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT 0.4 nozzle.json @@ -45,12 +45,15 @@ "70" ], "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool.json b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool.json index 4f89e83c22..56e2bb4b37 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool.json @@ -44,12 +44,15 @@ "enable_filament_ramming": "0", "gcode_flavor": "marlin2", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -57,36 +60,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle.json index 6f3cdc3ee9..c29401182c 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 MONO DUAL 0.4 nozzle.json @@ -44,12 +44,15 @@ "enable_filament_ramming": "0", "gcode_flavor": "marlin2", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -57,36 +60,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT 0.4 nozzle.json index 366c7b8ad8..396ff66720 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT 0.4 nozzle.json @@ -44,12 +44,15 @@ ], "gcode_flavor": "klipper", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -57,36 +60,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle PoopTool.json b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle PoopTool.json index 80934434bb..fe92961917 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle PoopTool.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle PoopTool.json @@ -44,12 +44,15 @@ "enable_filament_ramming": "0", "gcode_flavor": "klipper", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -57,36 +60,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "400", "400" ], "machine_max_speed_y": [ + "400", "400" ], "machine_max_speed_z": [ + "12", "12" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.3", "0.3" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle.json index a5dd04837c..fcaa8861c3 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle.json @@ -44,12 +44,15 @@ "enable_filament_ramming": "0", "gcode_flavor": "klipper", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -57,36 +60,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "400", "400" ], "machine_max_speed_y": [ + "400", "400" ], "machine_max_speed_z": [ + "12", "12" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.3", "0.3" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT 0.4 nozzle.json index f7308b5838..6b630b8cca 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT 0.4 nozzle.json @@ -45,12 +45,15 @@ "70" ], "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL 0.4 nozzle.json index e431c6ee24..fa70748531 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL 0.4 nozzle.json @@ -45,12 +45,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json index fe00d9421b..c53452a713 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT 0.4 nozzle.json index 81e3bfe34b..c16167cf3d 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT 0.4 nozzle.json @@ -45,12 +45,15 @@ "70" ], "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL 0.4 nozzle.json index fb189c1c70..32f8fdd6b6 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json index 694ea29dc1..d73cf4dc6c 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1200", "1200" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT 0.4 nozzle.json index 916c24cef6..2a201bcdce 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT 0.4 nozzle.json @@ -45,12 +45,15 @@ "70" ], "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL 0.4 nozzle.json index f168fa5fe5..df4f560839 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL 0.4 nozzle.json @@ -45,12 +45,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -58,36 +61,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json index 6b0c3af76c..04454aa072 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 MONO DUAL PoopTool 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT 0.4 nozzle.json index d79e811b91..3cded186e9 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL 0.4 nozzle.json index 931c88e897..30fae3ceae 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json index 6f6bea0067..8a3489ecea 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle.json @@ -46,12 +46,15 @@ ], "enable_filament_ramming": "0", "machine_max_acceleration_e": [ + "6000", "6000" ], "machine_max_acceleration_extruding": [ + "10000", "10000" ], "machine_max_acceleration_retracting": [ + "5000", "5000" ], "machine_max_acceleration_travel": [ @@ -59,36 +62,47 @@ "500" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "800", "800" ], "machine_max_acceleration_z": [ + "500", "500" ], "machine_max_speed_e": [ + "50", "50" ], "machine_max_speed_x": [ + "200", "200" ], "machine_max_speed_y": [ + "200", "200" ], "machine_max_speed_z": [ + "15", "15" ], "machine_max_jerk_e": [ + "2.5", "2.5" ], "machine_max_jerk_x": [ + "14", "14" ], "machine_max_jerk_y": [ + "14", "14" ], "machine_max_jerk_z": [ + "0.2", "0.2" ], "max_layer_height": [ diff --git a/resources/profiles/Wanhao.json b/resources/profiles/Wanhao.json index 96290c7712..8595e67dce 100644 --- a/resources/profiles/Wanhao.json +++ b/resources/profiles/Wanhao.json @@ -1,6 +1,6 @@ { "name": "Wanhao", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Wanhao configurations", "machine_model_list": [ diff --git a/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json index b96b3ce2d6..d79784d794 100644 --- a/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json +++ b/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json @@ -23,45 +23,59 @@ ], "gcode_flavor": "marlin", "machine_max_acceleration_e": [ + "10000", "10000" ], "machine_max_acceleration_extruding": [ + "1000", "1000" ], "machine_max_acceleration_retracting": [ + "1000", "1000" ], "machine_max_acceleration_x": [ + "1000", "1000" ], "machine_max_acceleration_y": [ + "1000", "1000" ], "machine_max_acceleration_z": [ + "100", "100" ], "machine_max_speed_e": [ + "60", "60" ], "machine_max_speed_x": [ + "500", "500" ], "machine_max_speed_y": [ + "500", "500" ], "machine_max_speed_z": [ + "10", "10" ], "machine_max_jerk_e": [ + "5", "5" ], "machine_max_jerk_x": [ + "10", "10" ], "machine_max_jerk_y": [ + "10", "10" ], "machine_max_jerk_z": [ + "0.3", "0.3" ], "max_layer_height": [ diff --git a/resources/profiles/Z-Bolt.json b/resources/profiles/Z-Bolt.json index 7c16785c62..b441ab9a72 100644 --- a/resources/profiles/Z-Bolt.json +++ b/resources/profiles/Z-Bolt.json @@ -1,7 +1,7 @@ { "name": "Z-Bolt", "url": "", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Z-Bolt configurations", "machine_model_list": [ diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json index 10b5421797..492f873ff9 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.4 nozzle", - "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt;Z-Bolt ABS @0.4 nozzle", + "inherits": "Generic ABS @Z-Bolt Base", "from": "system", "setting_id": "p97bQCnVyGgwMn2y", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json index ea89fac80f..d207982007 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.6 nozzle", - "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS @0.6 nozzle", + "inherits": "Generic ABS @Z-Bolt Base", "from": "system", "setting_id": "BQdgCL8lvVW7I8Dw", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json index 48c8a20136..a27dc9d803 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.8 nozzle", - "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS @0.8 nozzle", + "inherits": "Generic ABS @Z-Bolt Base", "from": "system", "setting_id": "Xn2L7IBp26Bb6G2K", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json index 7ee03a1904..b3b5e1990b 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.4 nozzle", - "inherits": "Generic ABS HT @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt;Z-Bolt ABS HT @0.4 nozzle", + "inherits": "Generic ABS HT @Z-Bolt Base", "from": "system", "setting_id": "TDGj84iuRAL9R1d4", "filament_id": "OFsP8PKH", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json index 626fbe9977..b36d374bfe 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.6 nozzle", - "inherits": "Generic ABS HT @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT @0.6 nozzle", + "inherits": "Generic ABS HT @Z-Bolt Base", "from": "system", "setting_id": "2AKxm2VhVlL2vMM1", "filament_id": "OFsP8PKH", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json index feb932dcdb..8d3db4162a 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.8 nozzle", - "inherits": "Generic ABS HT @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT @0.8 nozzle", + "inherits": "Generic ABS HT @Z-Bolt Base", "from": "system", "setting_id": "ztusMudd96Ns3Ip0", "filament_id": "OFsP8PKH", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json index c09de55efa..9071bde80a 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.4 nozzle", - "inherits": "Generic PA @Z-Bolt Base", "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt;Z-Bolt PA @0.4 nozzle", + "inherits": "Generic PA @Z-Bolt Base", "from": "system", "setting_id": "zuvJBWxHOiPMyExQ", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json index d6886e6b1e..35c7e3352f 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.6 nozzle", - "inherits": "Generic PA @Z-Bolt Base", "renamed_from": "Z-Bolt PA @0.6 nozzle", + "inherits": "Generic PA @Z-Bolt Base", "from": "system", "setting_id": "MB0n4BeDFEI25yTe", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json index 12a005431f..f50e82a0d9 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.8 nozzle", - "inherits": "Generic PA @Z-Bolt Base", "renamed_from": "Z-Bolt PA @0.8 nozzle", + "inherits": "Generic PA @Z-Bolt Base", "from": "system", "setting_id": "WZc4C1f6cPG8HZR3", "filament_id": "OFg8ndtj", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json index a28c4bc1c3..3ba2d3f680 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.4 nozzle", - "inherits": "Generic PETG @Z-Bolt Base", "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt;Z-Bolt PETG @0.4 nozzle", + "inherits": "Generic PETG @Z-Bolt Base", "from": "system", "setting_id": "LWwbNXs8bf1iGELi", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json index 15aab3fe46..2eea58f874 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.6 nozzle", - "inherits": "Generic PETG @Z-Bolt Base", "renamed_from": "Z-Bolt PETG @0.6 nozzle", + "inherits": "Generic PETG @Z-Bolt Base", "from": "system", "setting_id": "w4HVBbunzssG9j3s", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json index 4fe8b41490..5ff0c85771 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.8 nozzle", - "inherits": "Generic PETG @Z-Bolt Base", "renamed_from": "Z-Bolt PETG @0.8 nozzle", + "inherits": "Generic PETG @Z-Bolt Base", "from": "system", "setting_id": "TnLZ0vOVjIjng3u0", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json index 527888a93f..d5cc4c99aa 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.4 nozzle", - "inherits": "Generic PLA @Z-Bolt Base", "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt;Z-Bolt PLA @0.4 nozzle", + "inherits": "Generic PLA @Z-Bolt Base", "from": "system", "setting_id": "0MfamDPH1L6sMRff", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json index af58bff7c5..e35e0b7a99 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.6 nozzle", - "inherits": "Generic PLA @Z-Bolt Base", "renamed_from": "Z-Bolt PLA @0.6 nozzle", + "inherits": "Generic PLA @Z-Bolt Base", "from": "system", "setting_id": "tdq9Ye9GLpZXlak6", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json index dbe507507b..f86a0730bc 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.8 nozzle", - "inherits": "Generic PLA @Z-Bolt Base", "renamed_from": "Z-Bolt PLA @0.8 nozzle", + "inherits": "Generic PLA @Z-Bolt Base", "from": "system", "setting_id": "GKtc9mJusUZJD6kx", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.4 nozzle.json index da04d25c6c..ee6b691a52 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.4 nozzle.json @@ -22,9 +22,11 @@ "0.08" ], "retraction_length": [ + "0.6", "0.6" ], "retraction_minimum_travel": [ + "1", "1" ], "change_filament_gcode": "G91\nG1 Z{z_hop[0]} F1000\nG90", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json index 309b3292d8..63748d753f 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json @@ -23,9 +23,11 @@ "0.12" ], "retraction_length": [ + "0.7", "0.7" ], "retraction_minimum_travel": [ + "2", "2" ], "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json index 83f7fa507a..482a1ac26b 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json @@ -23,12 +23,15 @@ "0.16" ], "retraction_length": [ + "0.8", "0.8" ], "retract_length_toolchange": [ + "3", "3" ], "retraction_minimum_travel": [ + "3", "3" ], "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.4 nozzle.json index c461088460..b9b6d11f41 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.4 nozzle.json @@ -22,9 +22,11 @@ "0.08" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_minimum_travel": [ + "1", "1" ], "change_filament_gcode": "G91\nG1 Z{z_hop[0]} F1000\nG90", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json index 8e8cc70b43..8f99043bb0 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json @@ -23,9 +23,11 @@ "0.12" ], "retraction_length": [ + "1.4", "1.4" ], "retraction_minimum_travel": [ + "2", "2" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json index 506b51678b..b2c7cceef7 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json @@ -23,12 +23,15 @@ "0.16" ], "retraction_length": [ + "3", "3" ], "retract_length_toolchange": [ + "3", "3" ], "retraction_minimum_travel": [ + "3", "3" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.4 nozzle.json index d42c0e90f6..984bd4f36c 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.4 nozzle.json @@ -22,9 +22,11 @@ "0.08" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_minimum_travel": [ + "1", "1" ], "change_filament_gcode": "G91\nG1 Z{z_hop[0]} F1000\nG90", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json index 6664864f65..55bfcc4f2f 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json @@ -23,9 +23,11 @@ "0.12" ], "retraction_length": [ + "1.4", "1.4" ], "retraction_minimum_travel": [ + "2", "2" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json index 005c177fcf..2e57b6f3fa 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json @@ -23,12 +23,15 @@ "0.16" ], "retraction_length": [ + "3", "3" ], "retract_length_toolchange": [ + "3", "3" ], "retraction_minimum_travel": [ + "3", "3" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.4 nozzle.json index 5c2e417534..c53c5325a4 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.4 nozzle.json @@ -22,9 +22,11 @@ "0.08" ], "retraction_length": [ + "0.8", "0.8" ], "retraction_minimum_travel": [ + "1", "1" ], "change_filament_gcode": "G91\nG1 Z{z_hop[0]} F1000\nG90", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json index c15bf491f1..420c018e8c 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json @@ -23,9 +23,11 @@ "0.12" ], "retraction_length": [ + "1.4", "1.4" ], "retraction_minimum_travel": [ + "2", "2" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json index f51e1af0d8..5e1d2a0e99 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json @@ -23,12 +23,15 @@ "0.16" ], "retraction_length": [ + "3", "3" ], "retract_length_toolchange": [ + "3", "3" ], "retraction_minimum_travel": [ + "3", "3" ] } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json index 1e204e9f5c..168b120746 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json @@ -30,62 +30,92 @@ "#018001" ], "machine_max_acceleration_e": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_extruding": [ + "2500", + "2500", "2500", "2500" ], "machine_max_acceleration_retracting": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_travel": [ + "9000", + "9000", "9000", "9000" ], "machine_max_acceleration_x": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_y": [ + "20000", + "20000", "20000", "20000" ], "machine_max_acceleration_z": [ + "12", + "12", "12", "12" ], "machine_max_speed_e": [ + "30", + "30", "30", "30" ], "machine_max_speed_x": [ + "500", + "200", "500", "200" ], "machine_max_speed_y": [ + "500", + "200", "500", "200" ], "machine_max_speed_z": [ + "20", + "20", "20", "20" ], "machine_max_jerk_e": [ + "2.5", + "2.5", "2.5", "2.5" ], "machine_max_jerk_x": [ + "9", + "9", "9", "9" ], "machine_max_jerk_y": [ + "9", + "9", "9", "9" ], "machine_max_jerk_z": [ + "3", + "3", "3", "3" ], @@ -107,27 +137,37 @@ "extruder_clearance_height_to_rod": "70", "extruder_clearance_height_to_lid": "200", "retraction_minimum_travel": [ + "1", "1" ], "retract_before_wipe": [ + "0%", "0%" ], "retraction_length": [ + "0.6", "0.6" ], "retract_length_toolchange": [ + "2", "2" ], "z_hop": [ + "1", "1" ], "retraction_speed": [ + "35", "35" ], "deretraction_speed": [ + "35", "35" ], - "nozzle_type": "hardened_steel", + "nozzle_type": [ + "hardened_steel", + "hardened_steel" + ], "machine_tool_change_time": "1", "support_chamber_temp_control": "1", "change_filament_gcode": "G91\nG1 Z{z_hop[0]} F1000\nG90", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json index 5c4fc79417..4180f78364 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json @@ -23,9 +23,11 @@ "0.12" ], "retraction_length": [ + "0.7", "0.7" ], "retraction_minimum_travel": [ + "2", "2" ], "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json index 83fc5abc56..6b21d84d0f 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json @@ -23,12 +23,15 @@ "0.16" ], "retraction_length": [ + "0.8", "0.8" ], "retract_length_toolchange": [ + "3", "3" ], "retraction_minimum_travel": [ + "3", "3" ], "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/iQ.json b/resources/profiles/iQ.json index 1148b112f3..f6c8c1cab0 100644 --- a/resources/profiles/iQ.json +++ b/resources/profiles/iQ.json @@ -1,6 +1,6 @@ { "name": "innovatiQ", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "1", "description": "innovatiQ configuration", "machine_model_list": [ diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json index d0150d76e4..ef337f49eb 100644 --- a/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json @@ -34,6 +34,8 @@ ], "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.4 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.4 nozzle.json index 0fe6cccdd7..b02954271f 100644 --- a/resources/profiles/iQ/machine/iQ TiQ2 0.4 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.4 nozzle.json @@ -33,6 +33,8 @@ ], "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json index efb586ab4b..de636867a2 100644 --- a/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json @@ -34,6 +34,8 @@ ], "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json index 3758f03508..a5b99e26ec 100644 --- a/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json @@ -34,6 +34,8 @@ ], "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json index 7409d9e6c6..3507d2e57a 100644 --- a/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json @@ -33,6 +33,8 @@ ], "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], @@ -132,10 +134,14 @@ "Normal Lift" ], "machine_max_acceleration_x": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_y": [ + "1500", + "1500", "1500", "1500" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.4 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.4 nozzle.json index 484f9275bf..6f9129bd9c 100644 --- a/resources/profiles/iQ/machine/iQ TiQ8 0.4 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.4 nozzle.json @@ -33,6 +33,8 @@ ], "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], @@ -132,10 +134,14 @@ "Normal Lift" ], "machine_max_acceleration_x": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_y": [ + "1500", + "1500", "1500", "1500" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json index 6a12dcaaa0..7f8bdef3ff 100644 --- a/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json @@ -33,6 +33,8 @@ ], "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], @@ -132,10 +134,14 @@ "Normal Lift" ], "machine_max_acceleration_x": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_y": [ + "1500", + "1500", "1500", "1500" ], diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json index 76fe177a16..ab1e17cd04 100644 --- a/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json @@ -33,6 +33,8 @@ ], "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", "machine_max_speed_z": [ + "15", + "12", "15", "12" ], @@ -132,10 +134,14 @@ "Normal Lift" ], "machine_max_acceleration_x": [ + "1500", + "1500", "1500", "1500" ], "machine_max_acceleration_y": [ + "1500", + "1500", "1500", "1500" ], diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json index da34373d47..1a9e2ec591 100644 --- a/resources/profiles/re3D.json +++ b/resources/profiles/re3D.json @@ -1,7 +1,7 @@ { "name": "re3D", "url": "", - "version": "03.00.11", + "version": "03.00.12", "force_update": "0", "description": "re3D configurations", "machine_model_list": [ diff --git a/resources/profiles/re3D/filament/fdm_filament_pc.json b/resources/profiles/re3D/filament/fdm_filament_pc.json index 46e7670b93..58bd1fcb5f 100644 --- a/resources/profiles/re3D/filament/fdm_filament_pc.json +++ b/resources/profiles/re3D/filament/fdm_filament_pc.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "fdm_filament_pc", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "filament_type": [ "PC" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/fdm_filament_pet.json b/resources/profiles/re3D/filament/fdm_filament_pet.json index 3aab46b0d5..1366d9007d 100644 --- a/resources/profiles/re3D/filament/fdm_filament_pet.json +++ b/resources/profiles/re3D/filament/fdm_filament_pet.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "fdm_filament_pet", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "filament_type": [ "PETG" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/fdm_filament_pla.json b/resources/profiles/re3D/filament/fdm_filament_pla.json index b678250264..afb8d68adf 100644 --- a/resources/profiles/re3D/filament/fdm_filament_pla.json +++ b/resources/profiles/re3D/filament/fdm_filament_pla.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "fdm_filament_pla", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "filament_type": [ "PLA" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/fdm_filament_pp.json b/resources/profiles/re3D/filament/fdm_filament_pp.json index 16a1c9705d..2eb4a7e3e5 100644 --- a/resources/profiles/re3D/filament/fdm_filament_pp.json +++ b/resources/profiles/re3D/filament/fdm_filament_pp.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "fdm_filament_pp", + "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "inherits": "fdm_filament_common", "filament_type": [ "PP" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json b/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json index aa4a0baa91..c449570508 100644 --- a/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", "name": "re3D PC @0.4 nozzle", - "from": "system", "renamed_from": "re3D PC", - "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "OFU3QXL7", + "from": "system", "setting_id": "6yqRE2eSyER7X82N", + "filament_id": "OFU3QXL7", + "instantiation": "true", "filament_settings_id": [ "re3D PC @0.4 nozzle" ], @@ -174,4 +174,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json index 370a16baca..cd8fb98c77 100644 --- a/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "re3D PC @0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "OFU3QXL7", + "from": "system", "setting_id": "YVPbVSiVCzjp5ynf", + "filament_id": "OFU3QXL7", + "instantiation": "true", "filament_settings_id": [ "re3D PC @0.8 nozzle" ], @@ -173,4 +173,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json b/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json index 444fa42c55..d855ba13db 100644 --- a/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", "name": "re3D PETG @0.4 nozzle", - "from": "system", "renamed_from": "re3D PETG", - "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "OF3F63OE", + "from": "system", "setting_id": "epcrSCwjgRXMycBx", + "filament_id": "OF3F63OE", + "instantiation": "true", "filament_settings_id": [ "re3D PETG @0.4 nozzle" ], @@ -174,4 +174,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json index 93ae0e65a2..188406d9b6 100644 --- a/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "re3D PETG @0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "OF3F63OE", + "from": "system", "setting_id": "MoQie1JMlUeH0BwR", + "filament_id": "OF3F63OE", + "instantiation": "true", "filament_settings_id": [ "re3D PETG @0.8 nozzle" ], @@ -173,4 +173,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json b/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json index 0314778218..dcd1eda8dd 100644 --- a/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", "name": "re3D PLA @0.4 nozzle", - "from": "system", "renamed_from": "re3D PLA", - "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "OFRyOsZj", + "from": "system", "setting_id": "M8OOntNjjDBR4W32", + "filament_id": "OFRyOsZj", + "instantiation": "true", "filament_settings_id": [ "re3D PLA @0.4 nozzle" ], @@ -175,4 +175,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json index f537d9316c..0af2e0ac5e 100644 --- a/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "re3D PLA @0.8 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "OFRyOsZj", + "from": "system", "setting_id": "SpF19Y2sSYbPHyxz", + "filament_id": "OFRyOsZj", + "instantiation": "true", "filament_settings_id": [ "re3D PLA @0.8 nozzle" ], @@ -174,4 +174,4 @@ "filament_stamping_distance": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json index 5bc3c037bf..cdbb1e4a60 100644 --- a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFmCOW2Y", - "setting_id": "WlELqPVnuL7DaTxs", "name": "re3D rPETG @0.8 nozzle", - "from": "system", "renamed_from": "re3D Greengate rPETG @0.8 nozzle;re3D rPETG;re3D Greengate rPETG", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "WlELqPVnuL7DaTxs", + "filament_id": "OFmCOW2Y", + "instantiation": "true", "nozzle_temperature_initial_layer": [ "0" ], @@ -117,4 +117,4 @@ "re3D GigabotX 2 XLT 0.8 nozzle", "re3D TerabotX 2 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json b/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json index 888880055f..06c9f7ade1 100644 --- a/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFmCOW2Y", - "setting_id": "sHzO2S3mmE6Iqs2O", "name": "re3D rPETG @1.75 nozzle", - "from": "system", "renamed_from": "re3D Greengate rPETG @1.75 nozzle", - "instantiation": "true", "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "sHzO2S3mmE6Iqs2O", + "filament_id": "OFmCOW2Y", + "instantiation": "true", "nozzle_temperature_initial_layer": [ "0" ], @@ -117,4 +117,4 @@ "re3D GigabotX 2 XLT 1.75 nozzle", "re3D TerabotX 2 1.75 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json index 0b8b99eda1..b663a0dbce 100644 --- a/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json @@ -1,12 +1,12 @@ { "type": "filament", - "filament_id": "OFfHGM1D", - "setting_id": "i9ii0b7qFYWnkGSq", "name": "re3D rPP @0.8 nozzle", - "from": "system", "renamed_from": "re3D rPP", - "instantiation": "true", "inherits": "fdm_filament_pp", + "from": "system", + "setting_id": "i9ii0b7qFYWnkGSq", + "filament_id": "OFfHGM1D", + "instantiation": "true", "filament_type": [ "PP" ], @@ -63,4 +63,4 @@ "re3D GigabotX 2 XLT 0.8 nozzle", "re3D TerabotX 2 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json b/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json index e0b8574ab7..fe56a99f39 100644 --- a/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", - "filament_id": "OFfHGM1D", - "setting_id": "356nOwsfGLI3CNqU", "name": "re3D rPP @1.75 nozzle", - "from": "system", - "instantiation": "true", "inherits": "fdm_filament_pp", + "from": "system", + "setting_id": "356nOwsfGLI3CNqU", + "filament_id": "OFfHGM1D", + "instantiation": "true", "filament_type": [ "PP" ], @@ -62,4 +62,4 @@ "re3D GigabotX 2 XLT 1.75 nozzle", "re3D TerabotX 2 1.75 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/machine/fdm_re3D_common.json b/resources/profiles/re3D/machine/fdm_re3D_common.json index b8922e2fb9..3924573048 100644 --- a/resources/profiles/re3D/machine/fdm_re3D_common.json +++ b/resources/profiles/re3D/machine/fdm_re3D_common.json @@ -1,9 +1,11 @@ { + "type": "machine", + "name": "fdm_re3D_common", + "inherits": "fdm_machine_common", + "instantiation": "false", "bed_exclude_area": [ "0x0" ], - "instantiation": "false", - "type": "machine", "deretraction_speed": [ "30", "30" @@ -16,13 +18,11 @@ "extruders_count": [ "2" ], - "inherits": "fdm_machine_common", "machine_end_gcode": "G92 E0\nTURN_OFF_HEATERS\nG28 X Y\nM18\nM107", "machine_start_gcode": "M83 ; Use relative extrusion distances\nG28 ; Home all axes\nM140 S{first_layer_bed_temperature[initial_tool]} ; Start heating bed\nM190 S{first_layer_bed_temperature[initial_tool]} ; Wait for bed to reach temperature\n\nT{initial_tool}\n\n\n; ---------------------------\n; HEAT THE USED TOOL\n; ---------------------------\n{if is_extruder_used[initial_tool]}\nM104 T{initial_tool} S{first_layer_temperature[initial_tool]} ; Preheat active extruder to first layer temperature\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]} ; Wait for active extruder to reach temperature\n{endif}\n\nG1 F18000\nG4 S0\nG92 E0", "machine_tool_change_time": [ "90" ], - "name": "fdm_re3D_common", "printer_technology": "FFF", "retract_before_wipe": [ "70%", @@ -128,4 +128,4 @@ ], "wipe_tower_type": "type2", "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 0.4 nozzle.json b/resources/profiles/re3D/machine/re3D Gigabot 4 0.4 nozzle.json index 6ab8f4ed61..394edef4ba 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 0.4 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Gigabot 4 0.4 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "2FfoXQpNqgdO0psS", "instantiation": "true", "machine_tech": "FFF", "model_id": "GB4", @@ -31,6 +32,5 @@ "re3D PETG @0.4 nozzle" ], "default_print_profile": "0.26 Standard", - "printer_settings_id": "re3d_gigbot4_04", - "setting_id": "2FfoXQpNqgdO0psS" -} \ No newline at end of file + "printer_settings_id": "re3d_gigbot4_04" +} diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D Gigabot 4 0.8 nozzle.json index e87cdacef1..87086d516b 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Gigabot 4 0.8 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "t5Efv7WaUvnPYIAm", "instantiation": "true", "machine_tech": "FFF", "model_id": "GB4", @@ -31,6 +32,5 @@ "re3D PETG @0.8 nozzle" ], "default_print_profile": "0.4 Standard", - "printer_settings_id": "re3d_gigbot4_08", - "setting_id": "t5Efv7WaUvnPYIAm" -} \ No newline at end of file + "printer_settings_id": "re3d_gigbot4_08" +} diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.4 nozzle.json b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.4 nozzle.json index dedb29c3e8..b58338c041 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.4 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Gigabot 4 XLT 0.4 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "UrYpMJff1UulWnSk", "instantiation": "true", "machine_tech": "FFF", "model_id": "GB4", @@ -31,6 +32,5 @@ "re3D PETG @0.4 nozzle" ], "default_print_profile": "0.26 Standard", - "printer_settings_id": "re3d_gigabot4_xlt_04", - "setting_id": "UrYpMJff1UulWnSk" -} \ No newline at end of file + "printer_settings_id": "re3d_gigabot4_xlt_04" +} diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.8 nozzle.json index f34890289c..8fd896087e 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Gigabot 4 XLT 0.8 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "owqU0OvESWbbsBaw", "instantiation": "true", "machine_tech": "FFF", "model_id": "GB4", @@ -31,6 +32,5 @@ "re3D PETG @0.8 nozzle" ], "default_print_profile": "0.4 Standard", - "printer_settings_id": "re3d_gigabot4_xlt_08", - "setting_id": "owqU0OvESWbbsBaw" -} \ No newline at end of file + "printer_settings_id": "re3d_gigabot4_xlt_08" +} diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json index fd7858de60..5fa299ee5e 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D Gigabot 4 XLT", + "instantiation": "false", "model_id": "re3D Gigabot 4 XLT", "nozzle_diameter": "0.4;0.8", - "instantiation": "false", "machine_tech": "FFF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4.json b/resources/profiles/re3D/machine/re3D Gigabot 4.json index 67531b1214..9926381d68 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D Gigabot 4", + "instantiation": "false", "model_id": "re3D Gigabot 4", "nozzle_diameter": "0.4;0.8", - "instantiation": "false", "machine_tech": "FFF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D GigabotX 2 0.8 nozzle.json index f6bac17a0d..7765edcebe 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D GigabotX 2 0.8 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "pASXL7fDFXAG0tkJ", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D GBX2", @@ -28,6 +29,5 @@ "re3D rPETG @0.8 nozzle" ], "default_print_profile": "0.6 Standard", - "printer_settings_id": "re3d_gbx_08", - "setting_id": "pASXL7fDFXAG0tkJ" -} \ No newline at end of file + "printer_settings_id": "re3d_gbx_08" +} diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 1.75 nozzle.json b/resources/profiles/re3D/machine/re3D GigabotX 2 1.75 nozzle.json index 585c219bc7..d827deb4ff 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 1.75 nozzle.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 1.75 nozzle.json @@ -3,6 +3,7 @@ "name": "re3D GigabotX 2 1.75 nozzle", "renamed_from": "re3D Gigabot X2 1.75 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "ozJ43xjd5bOWGvPH", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D GBX2", @@ -29,6 +30,5 @@ "re3D rPETG @1.75 nozzle" ], "default_print_profile": "1.0 Standard", - "printer_settings_id": "re3d_gbx_175", - "setting_id": "ozJ43xjd5bOWGvPH" -} \ No newline at end of file + "printer_settings_id": "re3d_gbx_175" +} diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 0.8 nozzle.json index 863d8e6403..a9b0c1e3c5 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D GigabotX 2 XLT 0.8 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "66tcU44A7VD232wV", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D GBX2 XLT", @@ -28,6 +29,5 @@ "re3D rPETG @0.8 nozzle" ], "default_print_profile": "0.6 Standard", - "printer_settings_id": "re3d_gbx_xlt_08", - "setting_id": "66tcU44A7VD232wV" -} \ No newline at end of file + "printer_settings_id": "re3d_gbx_xlt_08" +} diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 1.75 nozzle.json b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 1.75 nozzle.json index 5784b4e673..76023b8a1b 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 1.75 nozzle.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT 1.75 nozzle.json @@ -3,6 +3,7 @@ "name": "re3D GigabotX 2 XLT 1.75 nozzle", "renamed_from": "re3D Gigabot X2 XLT 1.75 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "L0PKsbwUEul8gil3", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D GBX2 XLT", @@ -29,6 +30,5 @@ "re3D rPETG @1.75 nozzle" ], "default_print_profile": "1.0 Standard", - "printer_settings_id": "re3d_gbx_xlt_175", - "setting_id": "L0PKsbwUEul8gil3" -} \ No newline at end of file + "printer_settings_id": "re3d_gbx_xlt_175" +} diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json index 1b77360139..0e14643a29 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D GigabotX 2 XLT", + "instantiation": "false", "model_id": "re3D GigabotX 2 XLT", "nozzle_diameter": "0.8;1.75", - "instantiation": "false", "machine_tech": "FGF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2.json b/resources/profiles/re3D/machine/re3D GigabotX 2.json index 20ec4ff207..b57f46585d 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D GigabotX 2", + "instantiation": "false", "model_id": "re3D GigabotX 2", "nozzle_diameter": "0.8;1.75", - "instantiation": "false", "machine_tech": "FGF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/machine/re3D Terabot 4 0.4 nozzle.json b/resources/profiles/re3D/machine/re3D Terabot 4 0.4 nozzle.json index e57e4058af..f151217f96 100644 --- a/resources/profiles/re3D/machine/re3D Terabot 4 0.4 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Terabot 4 0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Terabot 4 0.4 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "fjQ7KSytjKq40DSo", "instantiation": "true", "machine_tech": "FFF", "model_id": "TB4", @@ -31,6 +32,5 @@ "re3D PETG @0.4 nozzle" ], "default_print_profile": "0.26 Standard", - "printer_settings_id": "re3d_terabot4_04", - "setting_id": "fjQ7KSytjKq40DSo" -} \ No newline at end of file + "printer_settings_id": "re3d_terabot4_04" +} diff --git a/resources/profiles/re3D/machine/re3D Terabot 4 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D Terabot 4 0.8 nozzle.json index c15ac1f8b9..67db6a6a72 100644 --- a/resources/profiles/re3D/machine/re3D Terabot 4 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D Terabot 4 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D Terabot 4 0.8 nozzle", "inherits": "fdm_re3D_common", + "setting_id": "EsfqTpN28Qmlaov3", "instantiation": "true", "machine_tech": "FFF", "model_id": "TB4", @@ -31,6 +32,5 @@ "re3D PETG @0.8 nozzle" ], "default_print_profile": "0.4 Standard", - "printer_settings_id": "re3d_terabot4_08", - "setting_id": "EsfqTpN28Qmlaov3" -} \ No newline at end of file + "printer_settings_id": "re3d_terabot4_08" +} diff --git a/resources/profiles/re3D/machine/re3D Terabot 4.json b/resources/profiles/re3D/machine/re3D Terabot 4.json index eaca67fba0..000cc921bf 100644 --- a/resources/profiles/re3D/machine/re3D Terabot 4.json +++ b/resources/profiles/re3D/machine/re3D Terabot 4.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D Terabot 4", + "instantiation": "false", "model_id": "re3D Terabot 4", "nozzle_diameter": "0.4;0.8", - "instantiation": "false", "machine_tech": "FFF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/machine/re3D TerabotX 2 0.8 nozzle.json b/resources/profiles/re3D/machine/re3D TerabotX 2 0.8 nozzle.json index 5622a813c1..86b1d77c6e 100644 --- a/resources/profiles/re3D/machine/re3D TerabotX 2 0.8 nozzle.json +++ b/resources/profiles/re3D/machine/re3D TerabotX 2 0.8 nozzle.json @@ -2,6 +2,7 @@ "type": "machine", "name": "re3D TerabotX 2 0.8 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "A6jcgezqyq6DE5mi", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D TBX2", @@ -28,6 +29,5 @@ "re3D rPETG @0.8 nozzle" ], "default_print_profile": "0.6 Standard", - "printer_settings_id": "re3d_tbx2_08", - "setting_id": "A6jcgezqyq6DE5mi" -} \ No newline at end of file + "printer_settings_id": "re3d_tbx2_08" +} diff --git a/resources/profiles/re3D/machine/re3D TerabotX 2 1.75 nozzle.json b/resources/profiles/re3D/machine/re3D TerabotX 2 1.75 nozzle.json index 398ab006bd..c8b865bfd8 100644 --- a/resources/profiles/re3D/machine/re3D TerabotX 2 1.75 nozzle.json +++ b/resources/profiles/re3D/machine/re3D TerabotX 2 1.75 nozzle.json @@ -3,6 +3,7 @@ "name": "re3D TerabotX 2 1.75 nozzle", "renamed_from": "re3D Terabot X2 1.75 nozzle", "inherits": "fgf_re3D_common", + "setting_id": "FCcmkG4pnJhjZUBd", "instantiation": "true", "machine_tech": "FGF", "model_id": "re3D TBX2", @@ -29,6 +30,5 @@ "re3D rPETG @1.75 nozzle" ], "default_print_profile": "1.0 Standard", - "printer_settings_id": "re3d_tbx2_175", - "setting_id": "FCcmkG4pnJhjZUBd" -} \ No newline at end of file + "printer_settings_id": "re3d_tbx2_175" +} diff --git a/resources/profiles/re3D/machine/re3D TerabotX 2.json b/resources/profiles/re3D/machine/re3D TerabotX 2.json index 177c1e05d0..bbd8b1c22a 100644 --- a/resources/profiles/re3D/machine/re3D TerabotX 2.json +++ b/resources/profiles/re3D/machine/re3D TerabotX 2.json @@ -1,9 +1,9 @@ { "type": "machine_model", "name": "re3D TerabotX 2", + "instantiation": "false", "model_id": "re3D TerabotX 2", "nozzle_diameter": "0.8;1.75", - "instantiation": "false", "machine_tech": "FGF", "family": "re3D", "bed_model": "", diff --git a/resources/profiles/re3D/process/0.26mm Standard @re3D fdm 0.4.json b/resources/profiles/re3D/process/0.26mm Standard @re3D fdm 0.4.json index 2ab80cdf26..1bef3f24ab 100644 --- a/resources/profiles/re3D/process/0.26mm Standard @re3D fdm 0.4.json +++ b/resources/profiles/re3D/process/0.26mm Standard @re3D fdm 0.4.json @@ -1,11 +1,11 @@ { "type": "process", - "setting_id": "z8J2jOmdssB8DCBO", "name": "0.26 Standard", "renamed_from": "0.26mm Standard @re3D fdm 0.4", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_re3D_common", + "from": "system", + "setting_id": "z8J2jOmdssB8DCBO", + "instantiation": "true", "compatible_printers": [ "re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4 XLT 0.4 nozzle", @@ -24,33 +24,33 @@ "support_top_z_distance": "0.2", "support_bottom_z_distance": "0.2", "bridge_speed": "50", - "internal_bridge_speed": "150%", - "default_acceleration": "5000", - "outer_wall_speed": "60", - "initial_layer_speed": "50", - "gap_infill_speed": "60", - "sparse_infill_speed": "80", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "support_interface_speed": "30", - "support_speed": "90", - "top_surface_speed": "50", - "travel_speed": "300", - "top_surface_acceleration": "2500", - "initial_layer_acceleration": "1000", - "travel_acceleration": "5000", - "inner_wall_acceleration": "5000", - "ironing_speed": "25", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "initial_layer_infill_speed": "50", - "outer_wall_acceleration": "2500", - "bridge_acceleration": "3500", - "sparse_infill_acceleration": "5000", - "internal_solid_infill_acceleration": "5000", - "initial_layer_travel_speed": "100%", - "small_perimeter_speed": "50%", + "internal_bridge_speed": "150%", + "default_acceleration": "5000", + "outer_wall_speed": "60", + "initial_layer_speed": "50", + "gap_infill_speed": "60", + "sparse_infill_speed": "80", + "inner_wall_speed": "80", + "internal_solid_infill_speed": "80", + "support_interface_speed": "30", + "support_speed": "90", + "top_surface_speed": "50", + "travel_speed": "300", + "top_surface_acceleration": "2500", + "initial_layer_acceleration": "1000", + "travel_acceleration": "5000", + "inner_wall_acceleration": "5000", + "ironing_speed": "25", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "initial_layer_infill_speed": "50", + "outer_wall_acceleration": "2500", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "5000", + "internal_solid_infill_acceleration": "5000", + "initial_layer_travel_speed": "100%", + "small_perimeter_speed": "50%", "filename_format": "{input_filename_base}_{\"E\"}{initial_tool}_{filament_type[initial_tool]}_{print_time}.gcode" } diff --git a/resources/profiles/re3D/process/0.2mm Fine @re3D fdm 0.4.json b/resources/profiles/re3D/process/0.2mm Fine @re3D fdm 0.4.json index 10013e9c36..5b2d009cf4 100644 --- a/resources/profiles/re3D/process/0.2mm Fine @re3D fdm 0.4.json +++ b/resources/profiles/re3D/process/0.2mm Fine @re3D fdm 0.4.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "u9PNexqDf7jWUnnH", "name": "0.2 Fine", "renamed_from": "0.2mm Fine @re3D fdm 0.4", - "from": "system", "inherits": "fdm_process_re3D_common", + "from": "system", + "setting_id": "u9PNexqDf7jWUnnH", "instantiation": "true", "compatible_printers": [ "re3D Gigabot 4 0.4 nozzle", @@ -24,30 +24,30 @@ "support_top_z_distance": "0.2", "support_bottom_z_distance": "0.2", "outer_wall_speed": "60", - "initial_layer_speed": "50", - "gap_infill_speed": "60", - "sparse_infill_speed": "80", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "support_interface_speed": "30", - "support_speed": "90", - "top_surface_speed": "50", - "travel_speed": "300", - "top_surface_acceleration": "2500", - "initial_layer_acceleration": "1000", - "travel_acceleration": "5000", - "inner_wall_acceleration": "5000", - "ironing_speed": "25", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "initial_layer_infill_speed": "50", - "outer_wall_acceleration": "2500", - "bridge_acceleration": "3500", - "sparse_infill_acceleration": "5000", - "internal_solid_infill_acceleration": "5000", - "initial_layer_travel_speed": "100%", - "small_perimeter_speed": "50%", + "initial_layer_speed": "50", + "gap_infill_speed": "60", + "sparse_infill_speed": "80", + "inner_wall_speed": "80", + "internal_solid_infill_speed": "80", + "support_interface_speed": "30", + "support_speed": "90", + "top_surface_speed": "50", + "travel_speed": "300", + "top_surface_acceleration": "2500", + "initial_layer_acceleration": "1000", + "travel_acceleration": "5000", + "inner_wall_acceleration": "5000", + "ironing_speed": "25", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "initial_layer_infill_speed": "50", + "outer_wall_acceleration": "2500", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "5000", + "internal_solid_infill_acceleration": "5000", + "initial_layer_travel_speed": "100%", + "small_perimeter_speed": "50%", "filename_format": "{input_filename_base}_{\"E\"}{initial_tool}_{filament_type[initial_tool]}_{print_time}.gcode" } diff --git a/resources/profiles/re3D/process/0.32mm Draft @re3D fdm 0.4.json b/resources/profiles/re3D/process/0.32mm Draft @re3D fdm 0.4.json index 1b14349f81..b64285819c 100644 --- a/resources/profiles/re3D/process/0.32mm Draft @re3D fdm 0.4.json +++ b/resources/profiles/re3D/process/0.32mm Draft @re3D fdm 0.4.json @@ -1,11 +1,11 @@ { "type": "process", - "setting_id": "pcKSZbNmByNtOHYX", "name": "0.32 Draft", "renamed_from": "0.32mm Draft @re3D fdm 0.4", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_re3D_common", + "from": "system", + "setting_id": "pcKSZbNmByNtOHYX", + "instantiation": "true", "compatible_printers": [ "re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4 XLT 0.4 nozzle", @@ -24,30 +24,30 @@ "support_top_z_distance": "0.35", "support_bottom_z_distance": "0.35", "outer_wall_speed": "60", - "initial_layer_speed": "50", - "gap_infill_speed": "60", - "sparse_infill_speed": "80", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "support_interface_speed": "30", - "support_speed": "90", - "top_surface_speed": "50", - "travel_speed": "300", - "top_surface_acceleration": "2500", - "initial_layer_acceleration": "1000", - "travel_acceleration": "5000", - "inner_wall_acceleration": "5000", - "ironing_speed": "25", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "initial_layer_infill_speed": "50", - "outer_wall_acceleration": "2500", - "bridge_acceleration": "3500", - "sparse_infill_acceleration": "5000", - "internal_solid_infill_acceleration": "5000", - "initial_layer_travel_speed": "100%", - "small_perimeter_speed": "50%", + "initial_layer_speed": "50", + "gap_infill_speed": "60", + "sparse_infill_speed": "80", + "inner_wall_speed": "80", + "internal_solid_infill_speed": "80", + "support_interface_speed": "30", + "support_speed": "90", + "top_surface_speed": "50", + "travel_speed": "300", + "top_surface_acceleration": "2500", + "initial_layer_acceleration": "1000", + "travel_acceleration": "5000", + "inner_wall_acceleration": "5000", + "ironing_speed": "25", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "initial_layer_infill_speed": "50", + "outer_wall_acceleration": "2500", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "5000", + "internal_solid_infill_acceleration": "5000", + "initial_layer_travel_speed": "100%", + "small_perimeter_speed": "50%", "filename_format": "{input_filename_base}_{\"E\"}{initial_tool}_{filament_type[initial_tool]}_{print_time}.gcode" } diff --git a/resources/profiles/re3D/process/0.3mm Fine @re3D fdm 0.8.json b/resources/profiles/re3D/process/0.3mm Fine @re3D fdm 0.8.json index 2b35f2c1f8..a5418c1cee 100644 --- a/resources/profiles/re3D/process/0.3mm Fine @re3D fdm 0.8.json +++ b/resources/profiles/re3D/process/0.3mm Fine @re3D fdm 0.8.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "ChglxET1YwzVuD6a", "name": "0.3 Fine", "renamed_from": "0.2mm Standard @re3D fdm 0.8", - "from": "system", "inherits": "fdm_process_re3D_common", + "from": "system", + "setting_id": "ChglxET1YwzVuD6a", "instantiation": "true", "compatible_printers": [ "re3D Gigabot 4 0.8 nozzle", @@ -24,30 +24,30 @@ "support_top_z_distance": "0.24", "support_bottom_z_distance": "0.24", "outer_wall_speed": "60", - "initial_layer_speed": "50", - "gap_infill_speed": "60", - "sparse_infill_speed": "80", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "support_interface_speed": "30", - "support_speed": "90", - "top_surface_speed": "50", - "travel_speed": "300", - "top_surface_acceleration": "2500", - "initial_layer_acceleration": "1000", - "travel_acceleration": "5000", - "inner_wall_acceleration": "5000", - "ironing_speed": "25", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "initial_layer_infill_speed": "50", - "outer_wall_acceleration": "2500", - "bridge_acceleration": "3500", - "sparse_infill_acceleration": "5000", - "internal_solid_infill_acceleration": "5000", - "initial_layer_travel_speed": "100%", - "small_perimeter_speed": "50%", + "initial_layer_speed": "50", + "gap_infill_speed": "60", + "sparse_infill_speed": "80", + "inner_wall_speed": "80", + "internal_solid_infill_speed": "80", + "support_interface_speed": "30", + "support_speed": "90", + "top_surface_speed": "50", + "travel_speed": "300", + "top_surface_acceleration": "2500", + "initial_layer_acceleration": "1000", + "travel_acceleration": "5000", + "inner_wall_acceleration": "5000", + "ironing_speed": "25", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "initial_layer_infill_speed": "50", + "outer_wall_acceleration": "2500", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "5000", + "internal_solid_infill_acceleration": "5000", + "initial_layer_travel_speed": "100%", + "small_perimeter_speed": "50%", "filename_format": "{input_filename_base}_{\"E\"}{initial_tool}_{filament_type[initial_tool]}_{print_time}.gcode" } diff --git a/resources/profiles/re3D/process/0.4mm Draft @re3D fdm 0.8.json b/resources/profiles/re3D/process/0.4mm Draft @re3D fdm 0.8.json index d00f8bce44..4ac2239ccb 100644 --- a/resources/profiles/re3D/process/0.4mm Draft @re3D fdm 0.8.json +++ b/resources/profiles/re3D/process/0.4mm Draft @re3D fdm 0.8.json @@ -1,11 +1,11 @@ { "type": "process", - "setting_id": "hiBgnEuKo4yjK3wp", "name": "0.4 Standard", "renamed_from": "0.4mm Draft @re3D fdm 0.8", - "from": "system", - "instantiation": "true", "inherits": "fdm_process_re3D_common", + "from": "system", + "setting_id": "hiBgnEuKo4yjK3wp", + "instantiation": "true", "compatible_printers": [ "re3D Gigabot 4 0.8 nozzle", "re3D Gigabot 4 XLT 0.8 nozzle", @@ -24,30 +24,30 @@ "support_top_z_distance": "0.42", "support_bottom_z_distance": "0.42", "outer_wall_speed": "60", - "initial_layer_speed": "50", - "gap_infill_speed": "60", - "sparse_infill_speed": "80", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "support_interface_speed": "30", - "support_speed": "90", - "top_surface_speed": "50", - "travel_speed": "300", - "top_surface_acceleration": "2500", - "initial_layer_acceleration": "1000", - "travel_acceleration": "5000", - "inner_wall_acceleration": "5000", - "ironing_speed": "25", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "initial_layer_infill_speed": "50", - "outer_wall_acceleration": "2500", - "bridge_acceleration": "3500", - "sparse_infill_acceleration": "5000", - "internal_solid_infill_acceleration": "5000", - "initial_layer_travel_speed": "100%", - "small_perimeter_speed": "50%", + "initial_layer_speed": "50", + "gap_infill_speed": "60", + "sparse_infill_speed": "80", + "inner_wall_speed": "80", + "internal_solid_infill_speed": "80", + "support_interface_speed": "30", + "support_speed": "90", + "top_surface_speed": "50", + "travel_speed": "300", + "top_surface_acceleration": "2500", + "initial_layer_acceleration": "1000", + "travel_acceleration": "5000", + "inner_wall_acceleration": "5000", + "ironing_speed": "25", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "initial_layer_infill_speed": "50", + "outer_wall_acceleration": "2500", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "5000", + "internal_solid_infill_acceleration": "5000", + "initial_layer_travel_speed": "100%", + "small_perimeter_speed": "50%", "filename_format": "{input_filename_base}_{\"E\"}{initial_tool}_{filament_type[initial_tool]}_{print_time}.gcode" } diff --git a/resources/profiles/re3D/process/0.6mm Standard @re3D fgf 0.8.json b/resources/profiles/re3D/process/0.6mm Standard @re3D fgf 0.8.json index 80cc07b339..15c9322c23 100644 --- a/resources/profiles/re3D/process/0.6mm Standard @re3D fgf 0.8.json +++ b/resources/profiles/re3D/process/0.6mm Standard @re3D fgf 0.8.json @@ -1,9 +1,9 @@ { "type": "process", - "setting_id": "7V7GXJOUd5LT6YNi", "name": "0.6 Standard", - "from": "system", "inherits": "fgf_process_re3D_common", + "from": "system", + "setting_id": "7V7GXJOUd5LT6YNi", "instantiation": "true", "layer_height": "0.6", "initial_layer_print_height": "0.8", @@ -23,4 +23,4 @@ "re3D GigabotX 2 XLT 0.8 nozzle", "re3D TerabotX 2 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/re3D/process/1.0mm Standard @re3D fgf 1.75.json b/resources/profiles/re3D/process/1.0mm Standard @re3D fgf 1.75.json index 5f703baaec..cf41e6854d 100644 --- a/resources/profiles/re3D/process/1.0mm Standard @re3D fgf 1.75.json +++ b/resources/profiles/re3D/process/1.0mm Standard @re3D fgf 1.75.json @@ -1,10 +1,10 @@ { "type": "process", - "setting_id": "LKf4K1hjRuLeW7SM", "name": "1.0 Standard", "renamed_from": "1.0mm Standard @re3D fgf 1.75", - "from": "system", "inherits": "fgf_process_re3D_common", + "from": "system", + "setting_id": "LKf4K1hjRuLeW7SM", "instantiation": "true", "layer_height": "1.0", "initial_layer_print_height": "1.0", @@ -24,4 +24,4 @@ "re3D GigabotX 2 XLT 1.75 nozzle", "re3D TerabotX 2 1.75 nozzle" ] -} \ No newline at end of file +} diff --git a/scripts/orca_profile_tool.py b/scripts/orca_profile_tool.py index 29863f8d1a..f7f622c8c0 100755 --- a/scripts/orca_profile_tool.py +++ b/scripts/orca_profile_tool.py @@ -6,6 +6,7 @@ usage: python scripts/orca_profile_tool.py [options] commands: check validate the whole tree -- what CI runs + fix-variant resize the variant arrays check rejects generate-id write the filament_id / setting_id each profile's identity implies normalize rewrite profile files into their canonical shape trim delete profile files no .json list references @@ -89,6 +90,7 @@ parent in the OFL map. filament_vendor / filament_type resolve the same way. """ import argparse +import functools import json import os import posixpath @@ -179,6 +181,99 @@ VECTOR_KEYS = { "filament_type", } +PRINT_CONFIG_CPP = os.path.normpath( + os.path.join(SCRIPTS_DIR, "..", "src", "libslic3r", "PrintConfig.cpp")) + + +@functools.lru_cache(maxsize=None) +def _variant_scheme(): + """Per config preset type: the key listing the preset's own variants, and the + stride of every key sized by it. + + Read from the four variant key sets in PrintConfig.cpp, the std::set + initializers DynamicPrintConfig::get_parameter_size sizes by, so membership is + the engine's own and not guessable from names. Each holds one value per variant; + printer_options_with_variant_2, the machine_max_* limits, holds a (normal, + silent) pair per variant, stride 2. + """ + with open(PRINT_CONFIG_CPP, encoding="utf-8") as f: + source = f.read() + + def members(name): + match = re.search(r"std::set\s+" + name + r"\s*=\s*\{(.*?)\};", + source, re.DOTALL) + if match is None: + raise RuntimeError(f"{PRINT_CONFIG_CPP} no longer defines {name}") + # An initializer can carry a commented-out entry (filament_extruder_id). + body = re.sub(r"//[^\n]*|/\*.*?\*/", "", match.group(1), flags=re.DOTALL) + return sorted(set(re.findall(r'"([^"\n]+)"', body))) + + return { + "machine": ("printer_extruder_variant", { + **dict.fromkeys(members("printer_options_with_variant_1"), 1), + **dict.fromkeys(members("printer_options_with_variant_2"), 2)}), + "process": ("print_extruder_variant", + dict.fromkeys(members("print_options_with_variant"), 1)), + "filament": ("filament_extruder_variant", + dict.fromkeys(members("filament_options_with_variant"), 1)), + } + + +@functools.lru_cache(maxsize=None) +def _variant_names(): + """The parts a variant string is built from, read from PrintConfig.cpp. + + A variant is selected by exact string compare of " ", so what is legal is the two enum maps the engine builds that string from, + not the list of strings some profile happens to ship. Returns (extruder types, + writable volume types, variant-name rewrites, extruder_type rewrites): the volume + types minus RUNTIME_VOLUME_TYPES, and the spellings PrintConfigDef::handle_legacy + rewrites in the six variant keys. The loader still accepts such a spelling, but a + profile must write the enum name, so the rewrite only names that name in the error; + it is read rather than restated because it belongs to the engine too. + """ + with open(PRINT_CONFIG_CPP, encoding="utf-8") as f: + source = f.read() + + def enum_map(name): + match = re.search(r"t_config_enum_values\s+" + name + r"\s*=\s*\{(.*?)\};", + source, re.DOTALL) + if match is None: + raise RuntimeError(f"{PRINT_CONFIG_CPP} no longer defines {name}") + body = re.sub(r"//[^\n]*|/\*.*?\*/", "", match.group(1), flags=re.DOTALL) + return set(re.findall(r'"([^"\n]+)"', body)) + + def rewrites(anchor): + """The (old, new) ReplaceString pairs of handle_legacy's branch for one key. + + An absent branch means the loader rewrites nothing, which is a defined answer + rather than a broken parse: every legacy name is then reported as unknown. + """ + match = re.search(r'opt_key == "' + anchor + r'"\s*\)\s*\{(.*?)\}', + source, re.DOTALL) + return ({} if match is None else + dict(re.findall(r'ReplaceString\(value,\s*"([^"]+)",\s*"([^"]+)"\)', + match.group(1)))) + + return (enum_map("s_keys_map_ExtruderType"), + enum_map("s_keys_map_NozzleVolumeType") - RUNTIME_VOLUME_TYPES, + rewrites("extruder_variant_list"), + rewrites("extruder_type")) + + +# What a preset that writes no variant layout takes: the default extruder_type and +# nozzle volume type (PrintConfig.cpp defaults for extruder_type and +# default_nozzle_volume_type), one such variant per extruder on a machine +# (extend_extruder_variant) and a single one on a process or filament. +DEFAULT_EXTRUDER_TYPE = "Direct Drive" +DEFAULT_NOZZLE_VOLUME_TYPE = "Standard" +DEFAULT_VARIANT = f"{DEFAULT_EXTRUDER_TYPE} {DEFAULT_NOZZLE_VOLUME_TYPE}" + +# A nozzle volume type the engine computes for a hybrid extruder at runtime, and no +# profile ever writes: s_keys_map_NozzleVolumeType carries it for the several +# sub-nozzles of one extruder, which no single variant string can name. +RUNTIME_VOLUME_TYPES = {"Hybrid"} + OF_ID_RE = re.compile(r"^OF[0-9A-Za-z]{6}$") # Filament name = preset base name: strip the first "@..." suffix. The space before # "@" is optional because names like "Afinia PLA@HS" exist. @@ -1248,6 +1343,482 @@ def check_vector_type_keys(profiles_dir, vendor): return error_count +@functools.lru_cache(maxsize=None) +def load_vendor_configs(profiles_dir, vendor): + """name -> (tree-relative file, data) per config preset type, from the bundle's + index lists - the per-kind maps the loader resolves inherits and include in. + + Cached because every vendor's filaments may reach OrcaFilamentLibrary. Unreadable + files are check_name_consistency's to report; when two indexed files claim one + name the first wins, as std::map::emplace keeps the first insertion. + """ + configs = {sub: {} for sub in PROFILE_SUBDIRS} + try: + index = load_json(os.path.join(str(profiles_dir), vendor + ".json")) + except (OSError, ValueError): + return configs + for section in PROFILE_TYPES: + for entry in index.get(section + "_list", []): + sub_path = entry.get("sub_path", "") + try: + data = load_json(os.path.join(str(profiles_dir), vendor, sub_path)) + except (OSError, ValueError): + continue + if isinstance(data, dict) and data.get("type") in configs and data.get("name"): + configs[data["type"]].setdefault(data["name"], (f"{vendor}/{sub_path}", data)) + return configs + + +def compose_config(name, presets, ofl_presets, cache, in_ofl=False, seen=frozenset()): + """A preset's config as the loader composes it: the parent's composed config, + then each `include` in the order listed, then its own keys - later layers win. + + Each key maps to (value, path): the value as the winning file wrote it, width + included, and the tree-relative files it passes through on the way to this + preset, from that file down to this one. `inherits` resolves in the bundle + first, then in OrcaFilamentLibrary (filaments only) and stays there once it + enters; `include` never leaves the includer's bundle. A name that resolves to + nothing, or a cycle, contributes nothing - the loader's own error paths leave + the preset without it too. + """ + if (in_ofl, name) in cache: + return cache[(in_ofl, name)] + bundle = ofl_presets if in_ofl else presets + if name not in bundle and not in_ofl and name in ofl_presets: + bundle, in_ofl = ofl_presets, True + if name not in bundle or name in seen: + return {} + seen = seen | {name} + rel, data = bundle[name] + config = {} + if data.get("inherits"): + config.update( + compose_config(data["inherits"], presets, ofl_presets, cache, in_ofl, seen)) + include = data.get("include") or [] + for included in ([include] if isinstance(include, str) else include): + if included in bundle: + config.update(compose_config(included, presets, ofl_presets, cache, in_ofl, seen)) + config = {key: (value, path + (rel,)) for key, (value, path) in config.items()} + config.update((key, (value, (rel,))) for key, value in data.items()) + cache[(in_ofl, name)] = config + return config + + +def _as_list(value): + return value if isinstance(value, list) else [value] + + +def _per_extruder(values, i): + """Entry i of a per-extruder vector, padded the way the loader pads: by its first value.""" + return values[i] if i < len(values) else values[0] + + +def _check_printer_layout(rel, config): + """A machine's extruder_variant_list, printer_extruder_variant, printer_extruder_id, + extruder_type and default_nozzle_volume_type agree with each other, the loader's + defaults standing in for whatever the composed config leaves out. + + A machine that writes none of the three list keys takes one default variant + "Direct Drive Standard" per extruder, so there is nothing to check. Otherwise + printer_extruder_variant is extruder_variant_list flattened extruder-major and + printer_extruder_id gives each of its entries its 1-based extruder (extruder 1 + everywhere when absent); every variant starts with its extruder's extruder_type + ("Direct Drive" when absent); the default_nozzle_volume_type ("Standard" when + absent) is one the extruder lists. A list without the pair leaves the loader on + the default single variant; a pair without the list gives the sidebar no variant + switch, and with single_extruder_multi_material off the loader replaces it with + one default variant per extruder. Returns (errors, warnings). + """ + menu = config.get("extruder_variant_list") + variant = config.get("printer_extruder_variant") + if menu is None and variant is None: + return 0, 0 + errors = warnings = 0 + extruders = len(_as_list(config.get("nozzle_diameter", [""]))) + types = _as_list(config.get("extruder_type", [DEFAULT_EXTRUDER_TYPE])) + volume_types = _as_list(config.get("default_nozzle_volume_type", [DEFAULT_NOZZLE_VOLUME_TYPE])) + semm_off = str(_as_list(config.get("single_extruder_multi_material", ["1"]))[0]) \ + .lower() in ("0", "false") + flat, ids = [], [] + if menu is not None: + menu = _as_list(menu) + if len(menu) != extruders: + print_error(f"{rel}: extruder_variant_list has {len(menu)} entries for {extruders} " + f"extruder(s) (nozzle_diameter); it holds one entry per extruder") + errors += 1 + for i, entry in enumerate(menu): + variants = entry.split(",") + flat += variants + ids += [str(i + 1)] * len(variants) + extruder_type = _per_extruder(types, i) + if not all(v.startswith(extruder_type + " ") for v in variants): + print_error(f'{rel}: extruder_variant_list entry {i + 1} "{entry}" holds a ' + f"variant that does not start with extruder {i + 1}'s " + f'extruder_type "{extruder_type}"') + errors += 1 + if f"{extruder_type} {_per_extruder(volume_types, i)}" not in variants: + print_error(f'{rel}: default_nozzle_volume_type "{_per_extruder(volume_types, i)}" is ' + f'not a nozzle volume type extruder {i + 1} lists ("{entry}")') + errors += 1 + if variant is not None: + variant = _as_list(variant) + written_ids = config.get("printer_extruder_id") + pair_ids = ["1"] * len(variant) if written_ids is None else _as_list(written_ids) + if len(pair_ids) != len(variant): + print_error(f"{rel}: printer_extruder_id has {len(pair_ids)} entries for the " + f"{len(variant)} entries of printer_extruder_variant") + errors += 1 + if menu is not None and variant is not None: + if variant != flat: + print_error(f"{rel}: printer_extruder_variant {json.dumps(variant)} is not " + f"extruder_variant_list flattened extruder-major {json.dumps(flat)}") + errors += 1 + elif pair_ids != ids: + print_error(f"{rel}: printer_extruder_id {json.dumps(pair_ids)}" + f"{' (absent, so extruder 1 everywhere)' if written_ids is None else ''} " + f"does not give each entry of printer_extruder_variant its 1-based " + f"extruder {json.dumps(ids)}") + errors += 1 + elif menu is not None: + if len(flat) > 1: + print_error(f"{rel}: extruder_variant_list offers {len(flat)} variants but the " + f"preset writes no printer_extruder_variant/printer_extruder_id, so the " + f'loader sizes every variant array to the single default variant ' + f'"{DEFAULT_VARIANT}" and no other variant has a value; write the pair') + errors += 1 + else: + crowded = [i for i in dict.fromkeys(pair_ids) if pair_ids.count(i) > 1] + if crowded: + print_error(f"{rel}: printer_extruder_variant lists several variants for extruder " + f"{crowded[0]} but the preset writes no extruder_variant_list, so the " + f"sidebar offers no variant switch and the extra variants are unreachable") + errors += 1 + elif semm_off and variant != [DEFAULT_VARIANT] * extruders: + print_warning(f"{rel}: with single_extruder_multi_material off the loader replaces " + f"printer_extruder_variant {json.dumps(variant)} by one " + f'"{DEFAULT_VARIANT}" per extruder, because extruder_variant_list is ' + f"absent; write the list or drop the pair") + warnings += 1 + return errors, warnings + + +def _variant_length(ptype, config): + """(variant length, reason) of a config as compose_config gives it, after + inherits and include. + + The variant length is the length of the preset's *_extruder_variant list. A + machine without one has the variants its extruder_variant_list offers, and + without that list one default "Direct Drive Standard" variant per extruder + (len(nozzle_diameter)) - the list's default in extend_extruder_variant. A process + or filament without its list has the single default variant. The reason says + which of these gave the length, and is empty when the list is written. + """ + list_key = _variant_scheme()[ptype][0] + if list_key in config: + return len(_as_list(config[list_key][0])), "" + if ptype != "machine": + return 1, f"no {list_key}, so the single default variant" + if "extruder_variant_list" in config: + menu = _as_list(config["extruder_variant_list"][0]) + return (sum(len(entry.split(",")) for entry in menu), + f"no {list_key}, so the variants extruder_variant_list offers") + extruders = len(_as_list(config["nozzle_diameter"][0])) if "nozzle_diameter" in config else 1 + return extruders, f"no {list_key}, so one default variant per extruder" + + +def _variant_presets(profiles_dir, vendor): + """Yield (ptype, rel, data, config, variant length, reason) for every machine, + process and filament preset of the bundle, bases included: data as its file + holds it, config as compose_config gives it, and the variant length and reason + as _variant_length does. + """ + presets = load_vendor_configs(profiles_dir, vendor) + library = {} if vendor == OFL else load_vendor_configs(profiles_dir, OFL)["filament"] + for ptype in _variant_scheme(): + ofl_presets = library if ptype == "filament" else {} + cache = {} + for name, (rel, data) in sorted(presets[ptype].items(), key=lambda item: item[1][0]): + config = compose_config(name, presets[ptype], ofl_presets, cache) + yield (ptype, rel, data, config, *_variant_length(ptype, config)) + + +def indexed_sub_paths(profiles_dir, vendor): + """The sub_paths a bundle's index lists, normalized, or None with no index. + + The loader reads what .json references and nothing else, so a file no list + names never loads and its contents are not worth judging; "filament/./X.json" + names the same file as "filament/X.json". A bundle with no readable index is + check_name_consistency's to report. Returns a set of sub_paths, or None. + """ + try: + library = load_json(os.path.join(profiles_dir, vendor + ".json")) + except (ValueError, OSError): + return None + listed = set() + for section in PROFILE_TYPES: + for entry in library.get(section + "_list", []): + if entry.get("sub_path"): + listed.add(posixpath.normpath(entry["sub_path"].replace("\\", "/"))) + return listed + + +def _variant_entries(key, value): + """(where, variant string) of every entry of a variant list key, as the loader + reads it: extruder_variant_list holds one ","-joined menu per extruder, the other + three one variant per array entry.""" + if key == "extruder_variant_list": + return [(f"extruder {i}", variant) + for i, entry in enumerate(_as_list(value), 1) + for variant in str(entry).split(",")] + return [(f"entry {i}", str(variant)) + for i, variant in enumerate(_as_list(value), 1)] + + +def _check_variant_string(rel, key, where, variant): + """Report one variant string that is not " " + in the engine's enum names. Returns the error count, 0 or 1. + + Legality is the two enum maps _variant_names reads, in every bundle: a variant + outside them is dead - nothing selects it, nothing rejects it, and it still counts + toward the variant length every array is sized by, so the values tuned for it + silently never reach the G-code. A legacy name the loader rewrites in these keys + is an error too, naming the enum name to write instead. + """ + extruder_types, volume_types, legacy, _extruder_legacy = _variant_names() + + if not variant: + print_error(f"{rel}: {key} {where} is empty; every entry names one variant, " + f'" "') + return 1 + # Longest first, so an extruder type that is a prefix of another cannot win. + extruder = next((t for t in sorted(extruder_types, key=len, reverse=True) + if variant.startswith(t + " ")), None) + if extruder is None: + # "DirectDrive" is rewritten in extruder_type alone, so a variant string + # carrying it is dead. + print_error(f'{rel}: {key} {where} holds "{variant}", which no extruder can ' + f"select: it does not start with an extruder type the enum has " + f'({", ".join(sorted(extruder_types))}); a variant is ' + f'" "') + return 1 + volume = variant[len(extruder) + 1:] + if volume in volume_types: + return 0 + if volume in legacy: + print_error(f'{rel}: {key} {where} holds the legacy variant "{variant}"; the ' + f'loader still rewrites "{volume}" to "{legacy[volume]}", but a ' + f'profile writes the enum name: "{extruder} {legacy[volume]}"') + elif volume in RUNTIME_VOLUME_TYPES: + print_error(f'{rel}: {key} {where} holds "{variant}", which no extruder can ' + f"select: Hybrid names the sub-nozzles of one hybrid extruder at " + f"runtime, never a nozzle volume type a profile writes") + else: + print_error(f'{rel}: {key} {where} holds "{variant}", which no extruder can ' + f'select: "{volume}" is not a nozzle volume type the enum has ' + f'({", ".join(sorted(volume_types))}), so nothing selects the variant ' + f"and the values tuned for it never reach the G-code") + return 1 + + +def _variant_repeats(data): + """One message per variant a preset's own lists name twice. + + The lookup returns the first equal string, so a repeat is a variant nothing + selects, and the value written beside it sits at an index no extruder reads. A + process's variant is the (extruder id, variant) pair, so one string on two + extruders is two pairs rather than a repeat; with print_extruder_id absent or + short every pair reads as extruder 1, which check_variant_arrays warns about once + per preset instead. + """ + messages = [] + if "filament_extruder_variant" in data: + variants = [str(v) for v in _as_list(data["filament_extruder_variant"])] + messages += [ + f'filament_extruder_variant lists "{v}" {variants.count(v)} times; a ' + f"filament's variants are matched by exact string, so the repeat is a " + f"variant nothing selects and its value sits at an index no extruder reads" + for v in sorted({v for v in variants if variants.count(v) > 1})] + if "extruder_variant_list" in data: + for i, entry in enumerate(_as_list(data["extruder_variant_list"]), 1): + variants = str(entry).split(",") + messages += [ + f'extruder_variant_list extruder {i} lists "{v}" ' + f"{variants.count(v)} times; the sidebar offers it once, so the repeat " + f"is a variant nothing selects and the arrays hold a value no extruder " + f"reads" + for v in sorted({v for v in variants if variants.count(v) > 1})] + if "print_extruder_variant" in data and "print_extruder_id" in data: + ids = _as_list(data["print_extruder_id"]) + variants = _as_list(data["print_extruder_variant"]) + if len(ids) == len(variants): + pairs = [(str(i), str(v)) for i, v in zip(ids, variants)] + messages += [ + f'print_extruder_variant lists the pair (extruder {i}, "{v}") ' + f"{pairs.count((i, v))} times; a variant is found by that pair, so the " + f"repeat is unreachable" + for i, v in sorted({p for p in pairs if pairs.count(p) > 1})] + return messages + + +def _check_variant_seed(rel, option, value, allowed, legacy, runtime=frozenset()): + """Report the values of an enum option a variant string is composed from. + + extruder_type and the nozzle volume type (nozzle_volume_type, seeded by + default_nozzle_volume_type) are the two halves of every variant string, and all + three are enum options: an unknown value fails the validator's load of the whole + bundle, while the app silently loads the option's default instead, which is worth + naming precisely here. A legacy name the loader rewrites, and a name in `runtime` + the engine computes for itself, are errors too. Returns the error count. + """ + errors = 0 + for name in ([] if value is None else _as_list(value)): + name = str(name) + if name in allowed: + continue + if name in legacy: + print_error(f'{rel}: {option} spells the legacy name "{name}"; the loader ' + f'still rewrites it to "{legacy[name]}", but a profile writes the ' + f"enum name") + elif name in runtime: + print_error(f'{rel}: {option} names "{name}", which the engine computes ' + f"for a hybrid extruder at runtime; no profile writes it") + else: + print_error(f'{rel}: {option} "{name}" is not one of ' + f'({", ".join(sorted(allowed))}); the option is an enum, so an ' + f"unknown value fails loading the whole bundle in the validator " + f"and silently becomes the default in the app") + errors += 1 + return errors + + +def check_variant_names(profiles_dir, vendor): + """Every variant string and extruder or nozzle volume type a preset writes is an + enum name the engine has. + + check_variant_arrays judges how many values a variant key holds; this judges what + the variants are called, the other half of the same scheme. It reads the four list + keys, extruder_type, nozzle_volume_type and default_nozzle_volume_type of every + preset the bundle's index references - bases included, since a base's list is what + sizes its children's arrays - and reports as errors, in every bundle alike: + + * a variant string the two enums cannot build (dead variant), a legacy spelling + the loader still rewrites in these keys included (_check_variant_string); + * a variant list naming one variant twice: the lookup returns the first equal + string, so the repeat is unreachable. A filament list takes variant strings, a + menu takes them per extruder, and a process takes (extruder id, variant) pairs, + where one string on two extruders is two pairs, not a repeat; + * an extruder_type, nozzle_volume_type or default_nozzle_volume_type that is not + an enum name a profile writes (_check_variant_seed). + + Key/value types elsewhere are check_vector_type_keys' and the validator's; a file + no list references is skipped, check_index_coverage having reported it. Returns + the error count. + """ + extruder_types, volume_types, legacy, extruder_legacy = _variant_names() + errors = 0 + listed = indexed_sub_paths(profiles_dir, vendor) + if listed is None: + return 0 + vendor_dir = os.path.join(profiles_dir, vendor) + + for path, _sub in iter_profile_files(vendor_dir): + if os.path.basename(path) in NON_PROFILE_FILES: + continue + sub_path = posixpath.normpath( + os.path.relpath(path, vendor_dir).replace(os.sep, "/")) + if sub_path not in listed: + continue + try: + data = load_json(path) + except (ValueError, OSError): + # Parse failures are reported by the checks that walk the same files. + continue + if not isinstance(data, dict): + continue + rel = f"{vendor}/{sub_path}" + + for key in ("extruder_variant_list", "printer_extruder_variant", + "print_extruder_variant", "filament_extruder_variant"): + if key in data: + for where, variant in _variant_entries(key, data[key]): + errors += _check_variant_string(rel, key, where, variant) + + # A list naming one variant twice, and the two enum values a variant string is + # composed from. + for message in _variant_repeats(data): + print_error(f"{rel}: {message}") + errors += 1 + errors += _check_variant_seed(rel, "extruder_type", data.get("extruder_type"), + extruder_types, extruder_legacy) + for option in ("nozzle_volume_type", "default_nozzle_volume_type"): + errors += _check_variant_seed(rel, option, data.get(option), volume_types, + legacy, RUNTIME_VOLUME_TYPES) + return errors + + +def check_variant_arrays(profiles_dir, vendor, strict=False): + """Every variant array an instantiated preset writes is exactly its + variant length x stride wide, and a printer's variant layout keys agree. + + Only instantiated presets are judged, each at the variant length of its composed + config (_variant_length's); a base is not, since what it writes counts only where + it reaches a preset that does not override it. A full-width array holds one + value per variant; any other width is an error, one value included and whatever + the values. A key the preset does not write takes what reaches it - the default, + or an array it inherits or includes - which the loader sizes to the preset, and + is not checked. With strict, every instantiated preset also holds each key that + reaches it at its own width, so a preset with other variants than the file its + array comes from restates the array. The machine_max_* limits hold + a (normal, silent) pair per variant. A process that lists variants pairs each + with its extruder id (extruder 1 everywhere when absent); a machine's layout keys + are held to _check_printer_layout, which reports a printer_extruder_id that does + not fit a written printer_extruder_variant, as the process check below does for + print_extruder_id. Returns (errors, warnings). + """ + errors = warnings = 0 + for ptype, rel, data, config, variant_length, reason in _variant_presets(profiles_dir, + vendor): + if data.get("instantiation") != "true": + continue + list_key, strides = _variant_scheme()[ptype] + listed = list_key in config + for key, stride in sorted(strides.items()): + if key not in config or (listed and key in ("printer_extruder_id", + "print_extruder_id")): + continue + if key not in data and not strict: + continue + value, path = config[key] + width, need = len(_as_list(value)), variant_length * stride + if width == need: + continue + print_error(f'{rel}: "{key}" has {width} values for variant length {variant_length}' + f"{' (' + reason + ')' if reason else ''} at stride {stride}, " + f"which takes {need}" + f"{'' if key in data else ' (it comes from ' + path[0] + ')'}") + errors += 1 + config = {key: value for key, (value, _path) in config.items()} + if ptype == "machine": + new_errors, new_warnings = _check_printer_layout(rel, config) + errors += new_errors + warnings += new_warnings + elif ptype == "process" and listed: + variants = _as_list(config[list_key]) + if "print_extruder_id" in config: + ids = _as_list(config["print_extruder_id"]) + if len(ids) != variant_length: + print_error(f"{rel}: print_extruder_id has {len(ids)} entries for the " + f"{variant_length} entries of print_extruder_variant; the two " + f"list the (extruder id, variant) pairs, one per entry") + errors += 1 + elif len(set(variants)) < len(variants): + print_warning(f"{rel}: print_extruder_variant repeats a variant but " + f"print_extruder_id is absent, so every entry defaults to " + f"extruder 1 and the repeated variant is unreachable") + warnings += 1 + return errors, warnings + + def check_conflict_keys(profiles_dir, vendor): """A renamed option and its old spelling must not co-exist in one profile. @@ -1348,9 +1919,12 @@ def check_normalized(profiles_dir, vendor): # check # --------------------------------------------------------------------------- -def check_profiles(profiles_dir=PROFILES_DIR, vendors=None): +def check_profiles(profiles_dir=PROFILES_DIR, vendors=None, strict=False): """Validate the whole profile tree. Returns the error count. + strict holds every preset's inherited and included variant arrays to its + own width too (check_variant_arrays). + The per-vendor checks honour `vendors`; the setting_id and filament_id checks are cross-vendor properties a narrowed run cannot answer, so they always cover the whole tree. With no `vendors`, every bundle is checked except the `user` directory @@ -1389,6 +1963,10 @@ def check_profiles(profiles_dir=PROFILES_DIR, vendors=None): warnings_found += new_warnings errors_found += check_vector_type_keys(profiles_dir, vendor) + errors_found += check_variant_names(profiles_dir, vendor) + new_errors, new_warnings = check_variant_arrays(profiles_dir, vendor, strict) + errors_found += new_errors + warnings_found += new_warnings errors_found += check_filament_id_length(profiles_dir, vendor) new_errors, gaps = check_index_coverage(profiles_dir, vendor) @@ -1493,6 +2071,49 @@ def delete_key_line(text, key, old_value=None): return text, 0 +_JSON_WS = re.compile(r"[ \t\r\n]*") + + +def _json_members(text): + """(key, key start, value start, value end) of each member of the top-level + JSON object in text, in file order.""" + decoder = json.JSONDecoder() + members = [] + i = _JSON_WS.match(text, text.index("{") + 1).end() + while text[i] != "}": + key_start = i + key, i = decoder.raw_decode(text, i) + i = _JSON_WS.match(text, _JSON_WS.match(text, i).end() + 1).end() # past the ':' + _value, end = decoder.raw_decode(text, i) + members.append((key, key_start, i, end)) + i = _JSON_WS.match(text, end).end() + i = _JSON_WS.match(text, i + (text[i] == ",")).end() + return members + + +def set_array_value(text, key, values): + """Write values as the "key" array, byte-preserving the rest. + + An existing array keeps its one-line or one-value-per-line layout; a preset + without the key gets it as its last member, one value per line, in the file's + own indentation and line ending. Returns (text, 1). + """ + items = [json.dumps(v, ensure_ascii=False) for v in values] + members = _json_members(text) + for name, _key_start, start, end in reversed(members): # json.load keeps the last + if name == key: + m = re.fullmatch(r"\[(\r?\n)([ \t]*).*(\r?\n)([ \t]*)\]", text[start:end], re.DOTALL) + array = ("[" + ", ".join(items) + "]" if m is None else + "[" + m[1] + ("," + m[1]).join(m[2] + item for item in items) + + m[3] + m[4] + "]") + return text[:start] + array + text[end:], 1 + _name, key_start, _start, end = members[-1] + indent = text[text.rfind("\n", 0, key_start) + 1:key_start] + nl = "\r\n" if "\r\n" in text else "\n" + array = "[" + nl + ("," + nl).join(indent * 2 + item for item in items) + nl + indent + "]" + return text[:end] + "," + nl + indent + json.dumps(key) + ": " + array + text[end:], 1 + + def insert_filament_id(text, new_id): """Insert a `"filament_id"` line before `instantiation`, else after `name`.""" return insert_key_line(text, "filament_id", new_id, @@ -1908,6 +2529,21 @@ def create_ordered_profile(profile, priority_fields): # The keys that identify a preset, hoisted to the top of every rewritten file. NORMALIZE_FIELD_ORDER = ("type", "name", "renamed_from", "inherits", "from", "setting_id", "filament_id", "instantiation") + + +def identity_block_misplaced(keys): + """The identifying keys are not a correctly ordered prefix of `keys`. + + create_ordered_profile hoists them, so this is the one part of the canonical + shape a rewrite is guaranteed to change. Without asking, normalize would only + ever apply the hoist as a side effect of some other rule firing, which leaves + a file that breaks this rule reported as already normalized. + """ + present = [k for k in keys if k in NORMALIZE_FIELD_ORDER] + return (keys[:len(present)] != present + or present != [k for k in NORMALIZE_FIELD_ORDER if k in keys]) + + # Settings a filament profile must not pin: they belong to the process. FILAMENT_DROP_FIELDS = ("initial_layer_print_speed", "outer_wall_speed", "inner_wall_speed", "infill_speed", "top_surface_speed", @@ -1967,6 +2603,11 @@ def _normalize_profile(data, sub): del data[field] changes.append(f"remove {field}") + # Last, because it describes the file as written rather than its contents, and + # create_ordered_profile does the hoisting when the file is written. + if identity_block_misplaced(list(data)): + changes.append("put the identifying keys first") + return changes @@ -2304,6 +2945,128 @@ def update_profile_indexes(profiles_dir=PROFILES_DIR, vendors=None, profile_type return changed, errors +# --------------------------------------------------------------------------- +# fix-variant +# --------------------------------------------------------------------------- + +# The members of the variant sets that name the variants rather than hold values. +VARIANT_LAYOUT_KEYS = {"printer_extruder_variant", "printer_extruder_id", "print_extruder_variant", + "print_extruder_id", "filament_extruder_variant"} + + +def _fit_width(values, need, stride): + """values cut to need, or padded by repeating the last value - the last + (normal, silent) pair at stride 2, after dropping a trailing half pair; a lone + value fills every entry, normal and silent alike.""" + if len(values) > need: + return values[:need] + if len(values) == 1: + return values * need + values = values[:len(values) - len(values) % stride] + return values + values[-stride:] * ((need - len(values)) // stride) + + +def fix_variant_arrays(profiles_dir=PROFILES_DIR, vendors=None, dry_run=False, strict=False): + """Resize every variant array check_variant_arrays rejects to its + width: extra values are dropped, missing ones repeat the last. The variant lists + and extruder ids are layout, not values, and are left to check. + + An array an instantiated preset writes is resized in place, to the preset's + width; bases are left alone and no key is added. With strict, a key that then + reaches an instantiated preset at another width is written, resized, into the + most general file on the way down to the preset whose own width it fits and whose + instantiated presets taking it all need that width - a base only the presets with + a variant list inherit, say - else into the preset's own file. Presets of every bundle count towards that agreement; only + files of `vendors` are touched. Returns (files changed, errors). + """ + profiles_dir = str(profiles_dir) + names = list_vendor_names(profiles_dir) + scope = set(vendors or names) + files = {rel: data for vendor in names + for configs in load_vendor_configs(profiles_dir, vendor).values() + for rel, data in configs.values()} + verb = "would " if dry_run else "" + changed, errors = set(), 0 + + def fit(rel, key, values, need, stride): + fitted = _fit_width(values, need, stride) + if not fitted: + print_error(f'{rel}: "{key}" cannot be resized from {len(values)} to {need} values') + return fitted + + # Each preset's own arrays first, then (strict) what reaches the presets; a write + # into a preset hands its children a new source, which the next pass judges. The + # in-memory configs take each write so a dry run sees it too. + for _ in range(8): + own = {} # file -> its own variant length + users = defaultdict(list) # (file, key) -> [(value, path, need, stride)] + writes = defaultdict(dict) # file -> {key: values} + for vendor in names: + for ptype, rel, data, config, variant_length, _reason in _variant_presets( + profiles_dir, vendor): + own[rel] = variant_length + instantiated = data.get("instantiation") == "true" + for key, stride in _variant_scheme()[ptype][1].items(): + if key not in config or key in VARIANT_LAYOUT_KEYS: + continue + value, path = config[key] + values, need = _as_list(value), variant_length * stride + if key in data: + if len(values) != need and instantiated and vendor in scope: + fitted = fit(rel, key, values, need, stride) + if fitted: + writes[rel][key] = fitted + else: + errors += 1 + elif strict and instantiated: + users[(path[0], key)].append((values, path, need, stride)) + if not writes and strict: + for (_source, key), group in users.items(): + for values, path, need, stride in group: + if len(values) == need or path[-1].split("/")[0] not in scope: + continue + target = next((f for f in path if f.split("/")[0] in scope + and own[f] * stride == need + and all(n == need for _v, p, n, _s in group if f in p)), + path[-1]) + fitted = fit(path[-1], key, values, need, stride) + if fitted: + writes[target][key] = fitted + else: + errors += 1 + if not writes or errors: + break + for rel, arrays in sorted(writes.items()): + def apply(text, _arrays=arrays): + for key, values in _arrays.items(): + text, _n = set_array_value(text, key, values) + return text, len(_arrays) + + try: + data = _edit_profile(os.path.join(profiles_dir, *rel.split("/")), apply, dry_run, + "variant array resize") + except (OSError, RuntimeError, ValueError) as e: + print_error(str(e)) + errors += 1 + continue + print_info(f"{verb}resize {rel}: " + ", ".join( + f"{key} {len(_as_list(files[rel][key])) if key in files[rel] else 'added'}" + f" -> {len(values)}" for key, values in arrays.items())) + files[rel].update(arrays) + changed.add(rel) + if any(data.get(key) != values for key, values in arrays.items()): + print_error(f"{rel}: the variant array resize did not take effect") + errors += 1 + if errors: + break + else: + print_error("variant array resize did not settle; run check") + errors += 1 + load_vendor_configs.cache_clear() # its configs took the writes above + print_success(f"{len(changed)} profile(s) {'would be ' if dry_run else ''}resized") + return len(changed), errors + + # --------------------------------------------------------------------------- # CLI # --------------------------------------------------------------------------- @@ -2321,6 +3084,10 @@ examples: preview exactly that; writes nothing orca_profile_tool.py generate-id --setting-id --vendor Elegoo setting_id only, and only in that bundle + orca_profile_tool.py fix-variant --vendor Snapmaker --dry-run + preview resizing the variant arrays check rejects in that bundle + orca_profile_tool.py check --strict --vendor BBL + also hold every preset's inherited variant arrays to its own width after adding, renaming or deleting profile files, run in this order: normalize -> update-index -> generate-id -> check @@ -2369,19 +3136,39 @@ def build_parser(): name, parents=parents, help=help_text, description=description, allow_abbrev=False, formatter_class=argparse.RawDescriptionHelpFormatter) + strict_opt = argparse.ArgumentParser(add_help=False) + strict_opt.add_argument("--strict", action="store_true", + help="also hold every preset's inherited and included variant " + "arrays to its own width") + add( - "check", [vendor_opt, profiles_opt], + "check", [vendor_opt, strict_opt, profiles_opt], "validate the whole profile tree -- what CI runs", "Validate the whole profile tree: preset name uniqueness, index coverage\n" "both ways, compatible_printers, default-material references, obsolete,\n" - "conflicting and vector-typed keys, filament_id length, that normalize and\n" - "update-index would leave every bundle alone, and the tree-wide setting_id\n" - "and filament_id state. Exits nonzero on errors.\n" + "conflicting and vector-typed keys, variant names and variant array widths,\n" + "filament_id length, that normalize and update-index would leave every\n" + "bundle alone, and the tree-wide setting_id and filament_id state. Exits\n" + "nonzero on errors.\n" "\n" "--vendor narrows the per-vendor checks only: setting_id uniqueness and the\n" "filament_id state are cross-vendor properties a narrowed run cannot answer,\n" "so they always cover the whole tree.") + add("fix-variant", [vendor_opt, strict_opt, dry_run_opt, profiles_opt], + "resize the variant arrays check rejects", + "Resize every variant array that check reports as the wrong width\n" + "in the selectable preset that writes it: extra values are dropped, missing\n" + "ones repeat the last value (the last normal/silent pair for machine_max_*).\n" + "Bases are left alone and no key is added. The variant lists and extruder\n" + "ids are left to check. Byte-preserving apart from the arrays it writes.\n" + "\n" + "--strict then also writes each key that reaches a preset at another width:\n" + "into the most general file on the way down to the preset that has the\n" + "preset's width and whose presets all agree, else into the preset itself.\n" + "Presets of every bundle count towards that agreement; --vendor limits the\n" + "files written.") + generate_cmd = add( "generate-id", [vendor_opt, dry_run_opt, profiles_opt], "write the id each profile's identity implies", @@ -2461,14 +3248,17 @@ def main(argv=None): profile_types = tuple(getattr(args, "profile_type", []) or ()) or None if args.command == "check": - errors = check_profiles(profiles_dir, vendors) + errors = check_profiles(profiles_dir, vendors, strict=args.strict) return 1 if errors else 0 if args.command == "generate-id": return run_generate_id(profiles_dir, vendors, args.filament_id, args.setting_id, args.dry_run) - if args.command == "normalize": + if args.command == "fix-variant": + _changed, errors = fix_variant_arrays(profiles_dir, vendors, dry_run=args.dry_run, + strict=args.strict) + elif args.command == "normalize": _changed, errors = normalize_profiles(profiles_dir, vendors, profile_types, force=args.force, dry_run=args.dry_run) elif args.command == "trim": diff --git a/scripts/tests/test_profile_tool.py b/scripts/tests/test_profile_tool.py index 5359b1158b..a4e9a6f81b 100644 --- a/scripts/tests/test_profile_tool.py +++ b/scripts/tests/test_profile_tool.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Tests for the tree-maintenance half of scripts/orca_profile_tool.py: the -normalize, trim, update-index and check commands, and the subcommand dispatch that -reaches them (stdlib unittest, no external deps). +normalize, trim, update-index, fix-variant and check commands, and the subcommand +dispatch that reaches them (stdlib unittest, no external deps). The id halves are covered by test_filament_id.py and test_setting_id.py. @@ -140,6 +140,28 @@ class TestObsoleteKeys(unittest.TestCase): self.assertEqual(apt.OBSOLETE_KEYS, set(re.findall(r'"([^"\n]+)"', keys))) +class TestVariantScheme(unittest.TestCase): + def test_the_key_sets_are_read_from_the_engine(self): + scheme = apt._variant_scheme() + self.assertEqual(scheme["machine"][1]["retraction_length"], 1) + self.assertEqual(scheme["machine"][1]["machine_max_speed_x"], 2) + self.assertIn("outer_wall_speed", scheme["process"][1]) + self.assertIn("nozzle_temperature", scheme["filament"][1]) + # Commented out of its initializer, so not a member. + self.assertNotIn("filament_extruder_id", scheme["filament"][1]) + for list_key, strides in scheme.values(): + self.assertEqual(strides[list_key], 1) + + def test_the_variant_names_are_read_from_the_engine(self): + extruder_types, volume_types, legacy, extruder_legacy = apt._variant_names() + self.assertEqual(extruder_types, {"Direct Drive", "Bowden"}) + self.assertEqual(volume_types, {"Standard", "High Flow", "TPU High Flow", "E3D High Flow", "Extra High Flow"}) + # Hybrid is an enum value no variant string may name. + self.assertNotIn("Hybrid", volume_types) + self.assertEqual(legacy, {"Normal": "Standard", "Big Traffic": "High Flow"}) + self.assertEqual(extruder_legacy, {"DirectDrive": "Direct Drive"}) + + class TestNormalize(TreeCase): def test_a_missing_type_is_filled_in_from_the_directory(self): self.t.write("V", "filament/A.json", {"name": "A"}) @@ -917,10 +939,315 @@ class TestNormalized(TreeCase): # CLI dispatch # --------------------------------------------------------------------------- +class TestFixVariant(TreeCase): + def preset(self, rel, **data): + name = os.path.splitext(os.path.basename(rel))[0] + self.t.write("V", rel, {"type": rel.split("/")[0], "name": name, **data}) + self.t.index("V", rel.split("/")[0], name, rel) + + def processes(self, common): + """outer_wall_speed written once in a list-less base, reached by list-less + presets through one base and by two-variant presets through another.""" + dual = ["Direct Drive Standard", "Direct Drive High Flow"] + self.preset("process/common.json", instantiation="false", outer_wall_speed=common) + self.preset("process/single.json", inherits="common", instantiation="false") + self.preset("process/dual.json", inherits="common", instantiation="false", + print_extruder_variant=dual, print_extruder_id=["1", "1"]) + for name, base in (("S1", "single"), ("S2", "single"), ("D1", "dual")): + self.preset(f"process/{name}.json", inherits=base, instantiation="true") + + def width_errors(self, *strict): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + errors, _warnings = apt.check_variant_arrays(self.t.profiles, "V", bool(strict)) + return errors, buf.getvalue() + + def test_a_machine_without_a_variant_list_has_one_variant_per_extruder(self): + # extruder_variant_list defaults to one "Direct Drive Standard" per extruder. + self.preset("machine/M.json", instantiation="true", nozzle_diameter=["0.4", "0.4"], + retraction_length=["0.8", "1.2"], z_hop=["0.4"], + machine_max_speed_x=["500", "200"]) + errors, out = self.width_errors() + self.assertEqual(errors, 2, out) + self.assertIn('M.json: "z_hop" has 1 values for variant length 2 (no ' + 'printer_extruder_variant, so one default variant per extruder) at stride 1, ' + 'which takes 2', out) + self.assertIn('M.json: "machine_max_speed_x" has 2 values for variant length 2', out) + self.assertNotIn("retraction_length", out) + + def test_one_value_is_an_error_where_the_list_has_more_variants(self): + self.preset("process/P.json", instantiation="true", outer_wall_speed=["30"], + print_extruder_id=["1", "1"], + print_extruder_variant=["Direct Drive Standard", "Direct Drive High Flow"]) + errors, out = self.width_errors() + self.assertEqual(errors, 1, out) + self.assertIn('P.json: "outer_wall_speed" has 1 values for variant length 2 at stride 1, ' + 'which takes 2', out) + + def test_one_value_is_padded_to_every_variant(self): + self.preset("machine/M.json", instantiation="true", nozzle_diameter=["0.4"] * 3, + retraction_length=["0.8"], machine_max_speed_x=["500", "200"]) + rc, out = self.run_command("fix-variant") + self.assertEqual(rc, 0, out) + machine = self.t.read("V", "machine/M.json") + self.assertEqual(machine["retraction_length"], ["0.8"] * 3) + self.assertEqual(machine["machine_max_speed_x"], ["500", "200"] * 3) + self.assertEqual(self.width_errors()[0], 0) + + def test_extruder_ids_are_left_to_check(self): + self.preset("process/P.json", instantiation="true", print_extruder_id=["1"], + print_extruder_variant=["Direct Drive Standard", "Direct Drive High Flow"]) + self.run_command("fix-variant") + self.assertEqual(self.t.read("V", "process/P.json")["print_extruder_id"], ["1"]) + errors, out = self.width_errors() + self.assertEqual(errors, 1, out) + self.assertIn("print_extruder_id has 1 entries for the 2 entries", out) + + def test_a_base_is_judged_only_where_its_array_reaches_a_preset(self): + # A leaf overriding the base's one-value limit passes in both modes. + self.preset("machine/common.json", instantiation="false", machine_max_speed_x=["500"]) + self.preset("machine/M.json", inherits="common", instantiation="true", + machine_max_speed_x=["500", "200"]) + self.assertEqual(self.width_errors()[0], 0) + self.assertEqual(self.width_errors("strict")[0], 0) + + def test_a_shared_array_is_fixed_in_the_base_whose_presets_agree(self): + self.processes(["30", "40"]) + self.assertEqual(self.width_errors()[0], 0) + errors, out = self.width_errors("strict") + self.assertEqual(errors, 2, out) + self.assertIn('process/S1.json: "outer_wall_speed" has 2 values for variant length 1', out) + rc, out = self.run_command("fix-variant", "--strict") + self.assertEqual(rc, 0, out) + self.assertEqual(self.t.read("V", "process/single.json")["outer_wall_speed"], ["30"]) + self.assertEqual(self.t.read("V", "process/common.json")["outer_wall_speed"], + ["30", "40"]) + self.assertNotIn("outer_wall_speed", self.t.read("V", "process/S1.json")) + self.assertEqual(self.width_errors("strict")[0], 0) + + def test_an_inherited_array_is_checked_and_restated_only_when_strict(self): + self.processes(["30"]) + self.assertEqual(self.width_errors()[0], 0) + errors, out = self.width_errors("strict") + self.assertEqual(errors, 1, out) + self.assertIn('process/D1.json: "outer_wall_speed" has 1 values for variant length 2 at ' + 'stride 1, which takes 2 (it comes from V/process/common.json)', out) + before = self.t.bytes_map() + self.run_command("fix-variant") + self.assertEqual(self.t.bytes_map(), before) + rc, out = self.run_command("fix-variant", "--strict") + self.assertEqual(rc, 0, out) + self.assertEqual(self.t.read("V", "process/dual.json")["outer_wall_speed"], ["30", "30"]) + self.assertEqual(self.t.read("V", "process/common.json")["outer_wall_speed"], ["30"]) + self.assertEqual(self.width_errors("strict")[0], 0) + + def test_a_strict_array_never_lands_in_a_file_of_another_width(self): + # common is list-less (width 1) and D2 inherits it directly, so D2 takes it. + self.processes(["30"]) + self.preset("process/D2.json", inherits="common", instantiation="true", + print_extruder_variant=["Direct Drive Standard", "Direct Drive High Flow"], + print_extruder_id=["1", "1"]) + self.run_command("fix-variant", "--strict") + self.assertEqual(self.t.read("V", "process/D2.json")["outer_wall_speed"], ["30", "30"]) + self.assertEqual(self.t.read("V", "process/common.json")["outer_wall_speed"], ["30"]) + self.assertEqual(self.width_errors("strict")[0], 0) + + def test_extra_values_are_dropped_where_they_are_written(self): + self.preset("process/base.json", instantiation="false", outer_wall_speed=["30", "0"]) + self.preset("process/P1.json", inherits="base", instantiation="true", + inner_wall_speed=["40", "0"]) + self.preset("process/P2.json", inherits="base", instantiation="true") + self.run_command("fix-variant") + self.assertEqual(self.t.read("V", "process/P1.json")["inner_wall_speed"], ["40"]) + self.assertEqual(self.t.read("V", "process/base.json")["outer_wall_speed"], ["30", "0"]) + self.run_command("fix-variant", "--strict") + self.assertEqual(self.t.read("V", "process/base.json")["outer_wall_speed"], ["30"]) + self.assertNotIn("outer_wall_speed", self.t.read("V", "process/P1.json")) + + def test_the_rest_of_the_file_keeps_its_bytes(self): + self.t.write_raw("V", "process/P.json", b'{\n "type": "process", "name": "P",\n' + b' "instantiation": "true",\n "outer_wall_speed": ["30", "0"],\n' + b' "inner_wall_speed": [\n "40",\n "0"\n ]\n}\n') + self.t.index("V", "process", "P", "process/P.json") + self.run_command("fix-variant") + self.assertEqual(self.t.raw("V", "process/P.json"), + b'{\n "type": "process", "name": "P",\n' + b' "instantiation": "true",\n "outer_wall_speed": ["30"],\n' + b' "inner_wall_speed": [\n "40"\n ]\n}\n') + + def test_a_dry_run_writes_nothing(self): + self.processes(["30"]) + before = self.t.bytes_map() + rc, out = self.run_command("fix-variant", "--strict", "--dry-run") + self.assertEqual(rc, 0, out) + self.assertIn("would resize V/process/dual.json: outer_wall_speed added -> 2", out) + self.assertEqual(self.t.bytes_map(), before) + + def test_padding_repeats_the_last_value_or_pair(self): + self.assertEqual(apt._fit_width(["a", "b"], 4, 1), ["a", "b", "b", "b"]) + self.assertEqual(apt._fit_width(["a", "b", "c"], 6, 2), ["a", "b"] * 3) + self.assertEqual(apt._fit_width(["a", "b", "c"], 2, 2), ["a", "b"]) + self.assertEqual(apt._fit_width(["a"], 4, 2), ["a"] * 4) + + +class TestVariantNames(TreeCase): + def preset(self, rel, vendor="V", **data): + section = rel.split("/")[0] + name = os.path.splitext(os.path.basename(rel))[0] + self.t.write(vendor, rel, {"type": section, "name": name, **data}) + self.t.index(vendor, section, name, rel) + + def names(self, vendor="V"): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + errors = apt.check_variant_names(self.t.profiles, vendor) + return errors, buf.getvalue() + + def test_a_legal_variant_layout_passes(self): + self.preset("machine/M.json", instantiation="true", nozzle_diameter=["0.4"], + extruder_type=["Direct Drive"], + extruder_variant_list=["Direct Drive Standard,Direct Drive High Flow"], + printer_extruder_id=["1", "1"], + printer_extruder_variant=["Direct Drive Standard", + "Direct Drive High Flow"], + nozzle_volume_type=["High Flow"], + default_nozzle_volume_type=["Standard"]) + self.preset("process/P.json", instantiation="true", print_extruder_id=["1", "1"], + print_extruder_variant=["Direct Drive Standard", + "Direct Drive High Flow"]) + self.preset("filament/F.json", instantiation="true", + filament_extruder_variant=["Direct Drive Standard", "Bowden High Flow"]) + self.assertEqual(self.names()[0], 0, self.names()[1]) + + def test_a_variant_the_enum_cannot_build_is_an_error(self): + # An unknown volume type, in a list and in a menu, an extruder type that is not + # one, and the legacy extruder spelling that is rewritten in extruder_type alone. + cases = (("process/P1.json", "print_extruder_variant", "Direct Drive Fast", + 'entry 1 holds "Direct Drive Fast"', + "not a nozzle volume type the enum has"), + ("machine/M.json", "extruder_variant_list", + "Direct Drive Standard,Direct Drive Fast", + 'extruder 1 holds "Direct Drive Fast"', + "not a nozzle volume type the enum has"), + ("process/P2.json", "print_extruder_variant", "DD Standard", + 'entry 1 holds "DD Standard"', + "does not start with an extruder type the enum has"), + ("filament/F.json", "filament_extruder_variant", "DirectDrive Standard", + 'entry 1 holds "DirectDrive Standard"', + "does not start with an extruder type the enum has")) + for rel, key, value, _held, _why in cases: + self.preset(rel, instantiation="false", **{key: [value]}) + errors, out = self.names() + self.assertEqual(errors, len(cases), out) + for rel, key, _value, held, why in cases: + self.assertIn(f"V/{rel}: {key} {held}", out) + self.assertIn(why, out) + + def test_the_legacy_names_the_loader_rewrites_are_errors(self): + self.preset("machine/M.json", extruder_type=["DirectDrive"], + nozzle_volume_type=["Big Traffic"], + default_nozzle_volume_type=["Normal"], + printer_extruder_variant=["Direct Drive Big Traffic"]) + errors, out = self.names() + self.assertEqual(errors, 4, out) + self.assertIn('extruder_type spells the legacy name "DirectDrive"; the loader ' + 'still rewrites it to "Direct Drive"', out) + self.assertIn('V/machine/M.json: nozzle_volume_type spells the legacy name ' + '"Big Traffic"', out) + self.assertIn('default_nozzle_volume_type spells the legacy name "Normal"', out) + self.assertIn('holds the legacy variant "Direct Drive Big Traffic"', out) + self.assertIn('a profile writes the enum name: "Direct Drive High Flow"', out) + + def test_an_empty_entry_is_an_error(self): + self.preset("filament/F.json", + filament_extruder_variant=["Direct Drive Standard", ""]) + errors, out = self.names() + self.assertEqual(errors, 1, out) + self.assertIn("filament_extruder_variant entry 2 is empty", out) + + def test_hybrid_is_runtime_only(self): + self.preset("machine/M.json", nozzle_volume_type=["Hybrid"], + default_nozzle_volume_type=["Hybrid"], + printer_extruder_variant=["Direct Drive Hybrid"]) + errors, out = self.names() + self.assertEqual(errors, 3, out) + self.assertIn("Hybrid names the sub-nozzles of one hybrid extruder at runtime", out) + self.assertIn('V/machine/M.json: nozzle_volume_type names "Hybrid"', out) + self.assertIn('default_nozzle_volume_type names "Hybrid"', out) + + def test_bbl_is_held_to_the_enums_like_every_bundle(self): + # E3D High Flow passes because the engine's enum has it; TPU285 is a name no enum has. + self.preset("machine/M.json", vendor="BBL", extruder_type=["Direct Drive"], + extruder_variant_list=["Direct Drive Standard,Direct Drive E3D High Flow"], + printer_extruder_id=["1", "1"], + printer_extruder_variant=["Direct Drive Standard", + "Direct Drive E3D High Flow"]) + self.preset("process/P.json", vendor="BBL", instantiation="true", + print_extruder_variant=["Direct Drive TPU285"]) + errors, out = self.names("BBL") + self.assertEqual(errors, 1, out) + self.assertNotIn('holds "Direct Drive E3D High Flow"', out) + self.assertIn('"TPU285" is not a nozzle volume type the enum has', out) + + def test_a_list_may_not_name_one_variant_twice(self): + self.preset("filament/F.json", + filament_extruder_variant=["Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard"]) + self.preset("machine/M.json", + extruder_variant_list=["Direct Drive Standard,Direct Drive Standard," + "Direct Drive High Flow"]) + self.preset("process/P.json", print_extruder_id=["1", "1", "1"], + print_extruder_variant=["Direct Drive Standard", "Direct Drive High Flow", + "Direct Drive Standard"]) + errors, out = self.names() + self.assertEqual(errors, 3, out) + self.assertIn('filament_extruder_variant lists "Direct Drive Standard" 2 times', out) + self.assertIn('extruder_variant_list extruder 1 lists "Direct Drive Standard" 2 ' + "times", out) + self.assertIn('print_extruder_variant lists the pair (extruder 1, "Direct Drive ' + 'Standard") 2 times', out) + + def test_one_variant_on_two_extruders_is_two_pairs_not_a_repeat(self): + self.preset("process/P.json", print_extruder_id=["1", "2"], + print_extruder_variant=["Direct Drive Standard", + "Direct Drive Standard"]) + self.assertEqual(self.names()[0], 0, self.names()[1]) + + def test_an_unknown_enum_value_fails_the_bundle(self): + self.preset("machine/M.json", extruder_type=["Direct Drive", "Magnetic Drive"], + nozzle_volume_type=["Turbo"], + default_nozzle_volume_type=["Fast Flow"]) + errors, out = self.names() + self.assertEqual(errors, 3, out) + self.assertIn('extruder_type "Magnetic Drive" is not one of (Bowden, Direct Drive)', + out) + self.assertIn('V/machine/M.json: nozzle_volume_type "Turbo" is not one of (E3D High ' + "Flow, Extra High Flow, High Flow, Standard, TPU High Flow)", out) + self.assertIn('default_nozzle_volume_type "Fast Flow" is not one of (E3D High Flow, ' + "Extra High Flow, High Flow, Standard, TPU High Flow)", out) + + def test_a_file_no_list_references_is_not_judged(self): + # It never loads, so its variant names cannot reach anything; + # check_index_coverage reports the file itself. + self.t.write("V", "machine/M.json", {"type": "machine", "name": "M", + "printer_extruder_variant": ["Direct Drive Fast"]}) + self.assertEqual(self.names()[0], 0, self.names()[1]) + + def test_check_runs_it(self): + self.preset("filament/F.json", instantiation="false", + filament_extruder_variant=["Direct Drive Normal"]) + self.run_command("update-index") # so nothing but the name check can fail + rc, out = self.run_command("check") + self.assertEqual(rc, 1, out) + self.assertIn('holds the legacy variant "Direct Drive Normal"', out) + + class TestDispatch(TreeCase): def test_each_command_reaches_its_own_writer(self): self.t.write("V", "filament/A.json", {"type": "filament", "name": "A"}) for command, expected in (("normalize", "normalized"), + ("fix-variant", "resized"), ("trim", "unreferenced"), ("update-index", "vendor index")): with self.subTest(command=command): @@ -931,7 +1258,8 @@ class TestDispatch(TreeCase): def test_an_option_belongs_to_one_command_only(self): for argv in (["trim", "--force"], ["update-index", "--filament-id"], - ["check", "--profile-type", "filament"]): + ["check", "--profile-type", "filament"], + ["normalize", "--strict"]): with self.subTest(argv=argv): with self.assertRaises(SystemExit) as cm, \ contextlib.redirect_stdout(io.StringIO()), \ diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index c8fe00b17c..b2cc67f970 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -199,7 +199,8 @@ DynamicPrintConfig PresetBundle::construct_full_config( if (num_filaments <= 1) { // BBS: update filament config related with variants DynamicPrintConfig filament_config = in_filament_presets[0].config; - if (apply_extruder && ((extruder_count > 1) || different_extruder)) + // Orca: a multi-variant filament resolves its variants on a single-variant printer too. + if (apply_extruder && ((extruder_count > 1) || different_extruder || filament_config.has_multi_variant_filament())) filament_config.update_values_to_printer_extruders(out, extruder_count, extruder_volume_type_count, nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, filament_maps[0], (NozzleVolumeType)filament_volume_maps[0]); out.apply(filament_config); compatible_printers_condition.emplace_back(in_filament_presets[0].compatible_printers_condition()); @@ -223,7 +224,8 @@ DynamicPrintConfig PresetBundle::construct_full_config( filament_temp_configs.resize(num_filaments); for (size_t i = 0; i < num_filaments; ++i) { filament_temp_configs[i] = *(filament_configs[i]); - if (apply_extruder && ((extruder_count > 1) || different_extruder)) + // Orca: a multi-variant filament resolves its variants on a single-variant printer too. + if (apply_extruder && ((extruder_count > 1) || different_extruder || filament_temp_configs[i].has_multi_variant_filament())) filament_temp_configs[i].update_values_to_printer_extruders(out, extruder_count, extruder_volume_type_count, nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, filament_maps[i], (NozzleVolumeType)filament_volume_maps[i]); } @@ -4664,7 +4666,8 @@ DynamicPrintConfig PresetBundle::full_fff_config(bool apply_extruder, std::optio if (num_filaments <= 1) { //BBS: update filament config related with variants DynamicPrintConfig filament_config = this->filaments.get_edited_preset().config; - if (apply_extruder && ((extruder_count > 1) || different_extruder)) + // Orca: a multi-variant filament resolves its variants on a single-variant printer too. + if (apply_extruder && ((extruder_count > 1) || different_extruder || filament_config.has_multi_variant_filament())) filament_config.update_values_to_printer_extruders(out, extruder_count, extruder_volume_type_count, nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, filament_maps[0], (NozzleVolumeType)filament_volume_maps[0]); out.apply(filament_config); compatible_printers_condition.emplace_back(this->filaments.get_edited_preset().compatible_printers_condition()); @@ -4758,7 +4761,8 @@ DynamicPrintConfig PresetBundle::full_fff_config(bool apply_extruder, std::optio filament_temp_configs.resize(num_filaments); for (size_t i = 0; i < num_filaments; ++i) { filament_temp_configs[i] = *(filament_configs[i]); - if (apply_extruder && ((extruder_count > 1) || different_extruder)) + // Orca: a multi-variant filament resolves its variants on a single-variant printer too. + if (apply_extruder && ((extruder_count > 1) || different_extruder || filament_temp_configs[i].has_multi_variant_filament())) filament_temp_configs[i].update_values_to_printer_extruders(out, extruder_count, extruder_volume_type_count, nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, filament_maps[i], (NozzleVolumeType)filament_volume_maps[i]); } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 93b1e728de..b708b759b2 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -3938,6 +3938,9 @@ void Print::update_filament_maps_to_config(std::vector f_maps, std::vector< { int extruder_count = 1, extruder_volume_type_count = 1; bool support_multi = m_ori_full_print_config.support_different_extruders(extruder_count); + // Orca: resolve the filament variants wherever Print::apply does, a multi-variant filament + // on a single-variant printer included. + const bool expand_filaments = (extruder_count > 1) || support_multi || m_ori_full_print_config.has_multi_variant_filament(); std::vector> nozzle_volume_types; extruder_volume_type_count = m_ori_full_print_config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types); @@ -3978,7 +3981,7 @@ void Print::update_filament_maps_to_config(std::vector f_maps, std::vector< m_full_print_config = m_ori_full_print_config; std::set filament_keys = filament_options_with_variant; filament_keys.insert("filament_self_index"); - if ((extruder_count > 1) || support_multi) + if (expand_filaments) m_full_print_config.update_values_to_printer_extruders_for_multiple_filaments(m_full_print_config, extruder_count, extruder_volume_type_count, filament_keys, "filament_self_index", "filament_extruder_variant"); const std::vector &extruder_retract_keys = print_config_def.extruder_retract_keys(); @@ -3995,7 +3998,7 @@ void Print::update_filament_maps_to_config(std::vector f_maps, std::vector< compute_filament_override_value(opt_key, opt_old_machine, opt_new_machine, opt_new_filament, m_full_print_config, print_diff, filament_overrides, m_config.filament_map_2.values); } - if ((extruder_count > 1) || support_multi) { + if (expand_filaments) { t_config_option_keys keys(filament_options_with_variant.begin(), filament_options_with_variant.end()); keys.push_back("filament_self_index"); m_config.apply_only(m_full_print_config, keys, true); diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp index 67bf873629..21e2251b65 100644 --- a/src/libslic3r/PrintApply.cpp +++ b/src/libslic3r/PrintApply.cpp @@ -1317,7 +1317,9 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_ extruder_count, extruder_volume_type_count, filament_keys, "filament_self_index", "filament_extruder_variant", &dynamic_slot_indices); - else if ((extruder_count > 1) || different_extruder) + // Orca: also on a printer with a single extruder variant once a filament defines several + // (e.g. Standard and High Flow), so each filament takes its variant for that extruder. + else if ((extruder_count > 1) || different_extruder || new_full_config.has_multi_variant_filament()) new_full_config.update_values_to_printer_extruders_for_multiple_filaments(m_ori_full_print_config, extruder_count, extruder_volume_type_count, filament_keys, "filament_self_index", "filament_extruder_variant"); } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 1d994d7874..440f3e761a 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -626,7 +626,9 @@ static const t_config_enum_values s_keys_map_NozzleVolumeType = { { "Standard", nvtStandard }, { "High Flow", nvtHighFlow }, { "TPU High Flow", nvtTPUHighFlow }, - { "Hybrid", nvtHybrid } + { "Hybrid", nvtHybrid }, + { "E3D High Flow", nvtE3DHighFlow }, + { "Extra High Flow", nvtExtraHighFlow } }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(NozzleVolumeType) @@ -676,9 +678,34 @@ int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_ty for (int index = 0; index < int(variant_list.size()); ++index) { if (extruder_variant == variant_list[index] && variant_ids_1based[index] == variant_id_1based) { return index; } } + // Without this variant, use the id's own first variant (usually Standard), not variant index 0, + // which belongs to the first filament or extruder. + for (int index = 0; index < int(variant_list.size()); ++index) { + if (variant_ids_1based[index] == variant_id_1based) { return index; } + } return 0; } +std::set get_extruder_supported_nozzle_volume_types(const DynamicPrintConfig &printer_config, int extruder_id) +{ + std::set supported_types; + + auto *variant_list = printer_config.option("extruder_variant_list"); + auto *extruder_types = printer_config.option("extruder_type"); + if (!variant_list || !extruder_types || extruder_id < 0 || + extruder_id >= (int) variant_list->values.size() || extruder_id >= (int) extruder_types->values.size()) + return supported_types; + + const ExtruderType extruder_type = ExtruderType(extruder_types->values[extruder_id]); + for (NozzleVolumeType volume_type : get_valid_nozzle_volume_type()) { + // An unsupported extruder type yields an empty name, which would match any list. + const std::string variant = get_extruder_variant_string(extruder_type, volume_type); + if (!variant.empty() && variant_list->values[extruder_id].find(variant) != std::string::npos) + supported_types.insert(volume_type); + } + return supported_types; +} + std::string get_nozzle_volume_type_string(NozzleVolumeType nozzle_volume_type) { if (nozzle_volume_type > nvtMaxNozzleVolumeType) { @@ -5923,15 +5950,20 @@ void PrintConfigDef::init_fff_params() def->label = "Nozzle Volume Type"; def->tooltip = "Nozzle volume type for extruders."; def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); - // Order must match the NozzleVolumeType enum values (Standard=0, High Flow=1, Hybrid=2, TPU High Flow=3). + // Listed in display order. A position is not the enum value (E3D High Flow is 5, after the reserved 4), + // so map a position to its NozzleVolumeType through enum_keys_map. def->enum_values.push_back(L("Standard")); def->enum_values.push_back(L("High Flow")); def->enum_values.push_back(L("Hybrid")); def->enum_values.push_back(L("TPU High Flow")); + def->enum_values.push_back(L("E3D High Flow")); + def->enum_values.push_back(L("Extra High Flow")); def->enum_labels.push_back(L("Standard")); def->enum_labels.push_back(L("High Flow")); def->enum_labels.push_back(L("Hybrid")); def->enum_labels.push_back(L("TPU High Flow")); + def->enum_labels.push_back(L("E3D High Flow")); + def->enum_labels.push_back(L("Extra High Flow")); def->mode = comSimple; def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard }); @@ -5944,10 +5976,14 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back(L("High Flow")); def->enum_values.push_back(L("Hybrid")); def->enum_values.push_back(L("TPU High Flow")); + def->enum_values.push_back(L("E3D High Flow")); + def->enum_values.push_back(L("Extra High Flow")); def->enum_labels.push_back(L("Standard")); def->enum_labels.push_back(L("High Flow")); def->enum_labels.push_back(L("Hybrid")); def->enum_labels.push_back(L("TPU High Flow")); + def->enum_labels.push_back(L("E3D High Flow")); + def->enum_labels.push_back(L("Extra High Flow")); def->mode = comDevelop; def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard }); @@ -5986,7 +6022,7 @@ void PrintConfigDef::init_fff_params() // Per-nozzle volume type. Forward-compat-only registration with no slicing consumer — nothing in // src/ reads it; the engine resolves per-nozzle volume types from `extruder_nozzle_stats` tokens // instead. Kept registered so a project/config carrying it loads without an unknown-option - // substitution warning. Registers Standard/High Flow/TPU High Flow only (no Hybrid). + // substitution warning. Registers the physical types only (no Hybrid). // Internal use only, no translation. def = this->add("extruder_nozzle_volume_type", coEnums); def->label = "Extruder nozzle volume type"; @@ -5995,9 +6031,13 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("Standard"); def->enum_values.push_back("High Flow"); def->enum_values.push_back("TPU High Flow"); + def->enum_values.push_back("E3D High Flow"); + def->enum_values.push_back("Extra High Flow"); def->enum_labels.push_back("Standard"); def->enum_labels.push_back("High Flow"); def->enum_labels.push_back("TPU High Flow"); + def->enum_labels.push_back("E3D High Flow"); + def->enum_labels.push_back("Extra High Flow"); def->mode = comDevelop; def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard }); @@ -10070,6 +10110,13 @@ bool DynamicPrintConfig::is_using_different_extruders() return ret; } +bool DynamicPrintConfig::has_multi_variant_filament() const +{ + auto variants = dynamic_cast(this->option("filament_extruder_variant")); + auto diameters = dynamic_cast(this->option("filament_diameter")); + return variants && diameters && variants->size() > diameters->size(); +} + bool DynamicPrintConfig::support_different_extruders(int& extruder_count) const { std::set variant_set; @@ -11070,6 +11117,11 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen return; } std::vector filament_maps = opt_filament_map->values; + auto opt_ids = id_name.empty()? nullptr: dynamic_cast(this->option(id_name)); + // Orca: a map shorter than the filament count must not drop the filaments past its end; + // they take the first extruder. + if (opt_ids && !opt_ids->values.empty()) + filament_maps.resize(std::max(filament_maps.size(), *std::max_element(opt_ids->values.begin(), opt_ids->values.end())), 1); size_t filament_count = filament_maps.size(); //apply process settings auto opt_extruder_type = dynamic_cast(printer_config.option("extruder_type")); @@ -11088,7 +11140,6 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen // indexed out of bounds. if (opt_filament_volume_maps && opt_filament_volume_maps->values.size() == filament_count) filament_volume_maps = opt_filament_volume_maps->values; - auto opt_ids = id_name.empty()? nullptr: dynamic_cast(this->option(id_name)); std::vector variant_index; variant_index.resize(filament_count, -1); @@ -11105,9 +11156,10 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen //variant index variant_index[f_index] = get_index_for_extruder(f_index+1, id_name, extruder_type, nozzle_volume_type, variant_name); if (variant_index[f_index] < 0) { - BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", Line %1%: could not found extruder_type %2%, nozzle_volume_type %3%, filament_index %4%, extruder index %5%") + // Orca: a filament need not define every extruder variant (a Direct Drive filament on a + // Bowden printer), so this is not an invalid state: the filament's first variant is used. + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: could not found extruder_type %2%, nozzle_volume_type %3%, filament_index %4%, extruder index %5%") %__LINE__ %s_keys_names_ExtruderType[extruder_type] % s_keys_names_NozzleVolumeType[nozzle_volume_type] % (f_index+1) %filament_maps[f_index]; - assert(false); //for some updates happens in a invalid state(caused by popup window) //we need to avoid crash variant_index[f_index] = 0; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 679811d699..8b61280979 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -30,6 +30,8 @@ namespace Slic3r { +class DynamicPrintConfig; + enum GCodeFlavor : unsigned char { gcfMarlinLegacy, gcfKlipper, @@ -519,8 +521,11 @@ enum NozzleVolumeType { // with more than one sub-nozzle (extruder_max_nozzle_count > 1); matched as Standard for // preset lookup and never emitted in profile variant strings nvtTPUHighFlow, // physical variant, used on H2D/H2DP 0.4 nozzles only + // 4 is reserved: E3D High Flow is 5 in BambuStudio's slice_info and device numbering. + nvtE3DHighFlow = 5, // physical variant, E3D high-flow hotend on 0.4/0.6 nozzles + nvtExtraHighFlow = 6, // Orca: physical variant with no BambuStudio or device counterpart; only profiles name it // Integer values are serialized as raw ints in 3mf plate metadata and device MQTT, so they MUST stay stable. - nvtMaxNozzleVolumeType = nvtTPUHighFlow + nvtMaxNozzleVolumeType = nvtExtraHighFlow }; enum FilamentMapMode { @@ -558,11 +563,19 @@ static std::set get_valid_nozzle_volume_type() { // Hybrid is not a physical nozzle variant: presets never define it, so it must not // produce a variant string. if (t == nvtHybrid) continue; + // Skip the reserved gap between nvtTPUHighFlow (3) and nvtE3DHighFlow (5). + if (i > nvtTPUHighFlow && i < nvtE3DHighFlow) continue; type.insert(t); } return type; } +// The nozzle volume types the given extruder physically provides, as declared by the printer +// profile's extruder_variant_list. An empty set means the profile could not be read and must be +// treated as "unknown", not as "none". nvtHybrid is never reported: it describes an extruder +// holding a mix of nozzles, not a nozzle the profile can offer. +extern std::set get_extruder_supported_nozzle_volume_types(const DynamicPrintConfig &printer_config, int extruder_id); + std::string get_nozzle_volume_type_string(NozzleVolumeType nozzle_volume_type); static std::string bed_type_to_gcode_string(const BedType type) @@ -699,8 +712,6 @@ CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(SurfaceFillOrder) #undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS -class DynamicPrintConfig; - // Defines each and every configuration option of Slic3r, including the properties of the GUI dialogs. // Does not store the actual values, but defines default values. class PrintConfigDef : public ConfigDef @@ -821,6 +832,10 @@ public: //BBS bool is_using_different_extruders(); bool support_different_extruders(int& extruder_count) const; + // Whether any filament defines more than one variant (filament_extruder_variant longer than + // filament_diameter). Its variants then have to be resolved even on a printer with a single + // extruder variant, which picks the filament's variant of the same variant string. + bool has_multi_variant_filament() const; // Counts the config slots of a printer: one per (extruder x nozzle volume type) as described by // extruder_nozzle_stats, or simply one per extruder when the stats are absent/mismatched. // Fills nozzle_volume_types with each extruder's volume types in ascending enum order. diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 7055f441ac..9b85e80c10 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -818,12 +818,14 @@ NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const if (support_nozzle_volume(curr_obj)) { Label *nozzle_name_title = new Label(top_panel, _L("Nozzle")); m_comboBox_nozzle_type = new ::ComboBox(top_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, 0, nullptr, wxCB_READONLY); - wxArrayString nozzle_items; + // The labels are in display order, not enum order (E3D High Flow is 5 but the fifth label), so each + // item carries its NozzleVolumeType as client data. const ConfigOptionDef *nozzle_volume_type_def = print_config_def.get("nozzle_volume_type"); if (nozzle_volume_type_def && nozzle_volume_type_def->enum_keys_map) { - for (auto item : nozzle_volume_type_def->enum_labels) { nozzle_items.push_back(_L(item)); } + for (size_t i = 0; i < nozzle_volume_type_def->enum_labels.size(); ++i) + m_comboBox_nozzle_type->Append(_L(nozzle_volume_type_def->enum_labels[i]), wxNullBitmap, + (void *) (intptr_t) nozzle_volume_type_def->enum_keys_map->at(nozzle_volume_type_def->enum_values[i])); } - m_comboBox_nozzle_type->Set(nozzle_items); m_comboBox_nozzle_type->SetSelection(-1); flex_sizer->Add(nozzle_name_title); flex_sizer->Add(m_comboBox_nozzle_type); @@ -891,7 +893,7 @@ int NewCalibrationHistoryDialog::get_nozzle_combo_id_code() const void NewCalibrationHistoryDialog::on_select_nozzle_pos(wxCommandEvent &event) { - // Mirror the picked hotend's flow onto the (Orca index-based) nozzle-type combo. + // Mirror the picked hotend's flow onto the nozzle-type combo. if (!curr_obj || !m_comboBox_nozzle_id || !m_comboBox_nozzle_type || !curr_obj->GetNozzleSystem()) return; @@ -902,7 +904,9 @@ void NewCalibrationHistoryDialog::on_select_nozzle_pos(wxCommandEvent &event) DevNozzle nozzle = curr_obj->GetNozzleSystem()->GetNozzleByPosId(pos); if (nozzle.IsNormal()) { NozzleVolumeType volume_type = DevNozzle::ToNozzleVolumeType(nozzle.GetNozzleFlowType()); - m_comboBox_nozzle_type->SetSelection(static_cast(volume_type)); + for (unsigned int i = 0; i < m_comboBox_nozzle_type->GetCount(); ++i) + if (NozzleVolumeType(intptr_t(m_comboBox_nozzle_type->GetClientData(i))) == volume_type) + m_comboBox_nozzle_type->SetSelection(i); } } @@ -949,7 +953,7 @@ void NewCalibrationHistoryDialog::on_ok(wxCommandEvent &event) msg_dlg.ShowModal(); return; } - m_new_result.nozzle_volume_type = NozzleVolumeType(m_comboBox_nozzle_type->GetSelection()); + m_new_result.nozzle_volume_type = NozzleVolumeType(intptr_t(m_comboBox_nozzle_type->GetClientData(m_comboBox_nozzle_type->GetSelection()))); } auto filament_item = map_filament_items[m_comboBox_filament->GetValue().ToStdString()]; diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 7a83d39dd3..f4160885cb 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -803,6 +803,29 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) #define NOZZLE_LIST_DEFAULT 1 float nozzle_diameter_list[NOZZLE_LIST_COUNT] = {0.2, 0.4, 0.6, 0.8 }; +// The nozzle_volume_type labels are in display order, not enum order (E3D High Flow is 5 but the fifth +// label), so each item carries its NozzleVolumeType as client data and is selected by that value. +static void select_nozzle_volume(ComboBox *combo, NozzleVolumeType volume_type) +{ + for (unsigned int i = 0; i < combo->GetCount(); ++i) + if (NozzleVolumeType(intptr_t(combo->GetClientData(i))) == volume_type) { + combo->SetSelection(i); + return; + } +} + +static void fill_nozzle_volume_combo(ComboBox *combo) +{ + combo->Clear(); + const ConfigOptionDef *nozzle_volume_type_def = print_config_def.get("nozzle_volume_type"); + if (nozzle_volume_type_def && nozzle_volume_type_def->enum_keys_map) { + for (size_t i = 0; i < nozzle_volume_type_def->enum_labels.size(); ++i) + combo->Append(_L(nozzle_volume_type_def->enum_labels[i]), wxNullBitmap, + (void *) (intptr_t) nozzle_volume_type_def->enum_keys_map->at(nozzle_volume_type_def->enum_values[i])); + } + select_nozzle_volume(combo, NozzleVolumeType::nvtStandard); +} + void CalibrationPresetPage::init_selection_values() { // init nozzle diameter and nozzle volume @@ -813,15 +836,7 @@ void CalibrationPresetPage::init_selection_values() } m_comboBox_nozzle_dia->SetSelection(NOZZLE_LIST_DEFAULT); - m_comboBox_nozzle_volume->Clear(); - const ConfigOptionDef *nozzle_volume_type_def = print_config_def.get("nozzle_volume_type"); - if (nozzle_volume_type_def && nozzle_volume_type_def->enum_keys_map) { - for (auto item : nozzle_volume_type_def->enum_labels) { - m_comboBox_nozzle_volume->AppendString(_L(item)); - } - } - - m_comboBox_nozzle_volume->SetSelection(int(NozzleVolumeType::nvtStandard)); + fill_nozzle_volume_combo(m_comboBox_nozzle_volume); } Preset* cur_printer_preset = get_printer_preset(curr_obj, 0.4); @@ -866,15 +881,7 @@ void CalibrationPresetPage::init_selection_values() } m_left_comboBox_nozzle_dia->SetSelection(NOZZLE_LIST_DEFAULT); - m_left_comboBox_nozzle_volume->Clear(); - const ConfigOptionDef *nozzle_volume_type_def = print_config_def.get("nozzle_volume_type"); - if (nozzle_volume_type_def && nozzle_volume_type_def->enum_keys_map) { - for (auto item : nozzle_volume_type_def->enum_labels) { - m_left_comboBox_nozzle_volume->AppendString(_L(item)); - } - } - - m_left_comboBox_nozzle_volume->SetSelection(int(NozzleVolumeType::nvtStandard)); + fill_nozzle_volume_combo(m_left_comboBox_nozzle_volume); } // right @@ -885,15 +892,7 @@ void CalibrationPresetPage::init_selection_values() } m_right_comboBox_nozzle_dia->SetSelection(NOZZLE_LIST_DEFAULT); - m_right_comboBox_nozzle_volume->Clear(); - const ConfigOptionDef *nozzle_volume_type_def = print_config_def.get("nozzle_volume_type"); - if (nozzle_volume_type_def && nozzle_volume_type_def->enum_keys_map) { - for (auto item : nozzle_volume_type_def->enum_labels) { - m_right_comboBox_nozzle_volume->AppendString(_L(item)); - } - } - - m_right_comboBox_nozzle_volume->SetSelection(int(NozzleVolumeType::nvtStandard)); + fill_nozzle_volume_combo(m_right_comboBox_nozzle_volume); } } @@ -980,13 +979,13 @@ NozzleVolumeType CalibrationPresetPage::get_nozzle_volume_type(int extruder_id) if (curr_obj) { if (curr_obj->is_multi_extruders()) { if (extruder_id == LEFT_EXTRUDER_ID) { - return NozzleVolumeType(m_left_comboBox_nozzle_volume->GetSelection()); + return NozzleVolumeType(intptr_t(m_left_comboBox_nozzle_volume->GetClientData(m_left_comboBox_nozzle_volume->GetSelection()))); } else if (extruder_id == RIGHT_EXTRUDER_ID) { - return NozzleVolumeType(m_right_comboBox_nozzle_volume->GetSelection()); + return NozzleVolumeType(intptr_t(m_right_comboBox_nozzle_volume->GetClientData(m_right_comboBox_nozzle_volume->GetSelection()))); } } else - return NozzleVolumeType(m_comboBox_nozzle_volume->GetSelection()); + return NozzleVolumeType(intptr_t(m_comboBox_nozzle_volume->GetClientData(m_comboBox_nozzle_volume->GetSelection()))); } return NozzleVolumeType::nvtStandard; } @@ -2139,7 +2138,7 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) } if (obj->GetExtderSystem()->GetNozzleFlowType(i) != NozzleFlowType::NONE_FLOWTYPE) { - m_left_comboBox_nozzle_volume->SetSelection(int(DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(i)))); + select_nozzle_volume(m_left_comboBox_nozzle_volume, DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(i))); } else { m_left_comboBox_nozzle_volume->SetSelection(0); } @@ -2159,7 +2158,7 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) } if (obj->GetExtderSystem()->GetNozzleFlowType(i) != NozzleFlowType::NONE_FLOWTYPE) { - m_right_comboBox_nozzle_volume->SetSelection(int(DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(i)))); + select_nozzle_volume(m_right_comboBox_nozzle_volume, DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(i))); } else { m_right_comboBox_nozzle_volume->SetSelection(0); } @@ -2197,7 +2196,7 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) else { if ((obj->GetExtderSystem()->GetTotalExtderCount() > 0) && (obj->GetExtderSystem()->GetNozzleFlowType(0) != NozzleFlowType::NONE_FLOWTYPE)) { - m_comboBox_nozzle_volume->SetSelection(int(DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(0)))); + select_nozzle_volume(m_comboBox_nozzle_volume, DevNozzle::ToNozzleVolumeType(obj->GetExtderSystem()->GetNozzleFlowType(0))); } else { m_comboBox_nozzle_volume->SetSelection(0); } diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index 427f022d1c..fdff760078 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -732,6 +732,7 @@ void CaliPASaveAutoPanel::sync_cali_result_for_multi_extruder(const std::vector< case NozzleVolumeType::nvtStandard: nozzle_id_str += _L("Standard Flow"); break; case NozzleVolumeType::nvtHighFlow: nozzle_id_str += _L("High Flow"); break; case NozzleVolumeType::nvtTPUHighFlow: nozzle_id_str += _L("TPU High Flow"); break; + case NozzleVolumeType::nvtE3DHighFlow: nozzle_id_str += _L("E3D High Flow"); break; default: break; } nozzle_id_value->SetLabel(nozzle_id_str); diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.cpp b/src/slic3r/GUI/DeviceCore/DevCalib.cpp index ddf71e0c62..6385fa77c6 100644 --- a/src/slic3r/GUI/DeviceCore/DevCalib.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCalib.cpp @@ -36,7 +36,8 @@ static NozzleVolumeType convert_to_nozzle_type(const std::string &str) return NozzleVolumeType::nvtHighFlow; else if (str[1] == 'U') return NozzleVolumeType::nvtTPUHighFlow; - // Orca: no nvtE3DHighFlow in Orca's NozzleVolumeType; map 'B' to Standard + else if (str[1] == 'B') + return NozzleVolumeType::nvtE3DHighFlow; else return NozzleVolumeType::nvtStandard; } diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp index 578149b9d3..9f1b5311c2 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp @@ -13,7 +13,7 @@ namespace Slic3r { -// ---- DevNozzle: flow/volume conversions (Standard / High Flow / TPU High Flow) ---------------------- +// ---- DevNozzle: flow/volume conversions (Standard / High Flow / TPU High Flow / E3D High Flow) ------ // Device-reported U_FLOW nozzles map to nvtTPUHighFlow so a synced TPU-HF rack activates the H2C // change_filament_gcode TPU-kit branch. nvtHybrid is a slicer-only sentinel with no device // representation, so ToNozzleFlowType(nvtHybrid) falls through to NONE_FLOWTYPE. @@ -24,6 +24,7 @@ NozzleFlowType DevNozzle::ToNozzleFlowType(const NozzleVolumeType& type) case NozzleVolumeType::nvtStandard: return NozzleFlowType::S_FLOW; case NozzleVolumeType::nvtHighFlow: return NozzleFlowType::H_FLOW; case NozzleVolumeType::nvtTPUHighFlow: return NozzleFlowType::U_FLOW; + case NozzleVolumeType::nvtE3DHighFlow: return NozzleFlowType::E_FLOW; default: return NozzleFlowType::NONE_FLOWTYPE; } } @@ -34,6 +35,7 @@ NozzleVolumeType DevNozzle::ToNozzleVolumeType(const NozzleFlowType& type) case NozzleFlowType::S_FLOW: return NozzleVolumeType::nvtStandard; case NozzleFlowType::H_FLOW: return NozzleVolumeType::nvtHighFlow; case NozzleFlowType::U_FLOW: return NozzleVolumeType::nvtTPUHighFlow; + case NozzleFlowType::E_FLOW: return NozzleVolumeType::nvtE3DHighFlow; default: { BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << "nozzle flow type None convert to nozzle volume type Standard"; return NozzleVolumeType::nvtStandard; @@ -47,6 +49,7 @@ wxString DevNozzle::GetNozzleFlowTypeStr(NozzleFlowType type) case NozzleFlowType::H_FLOW: return _L("High Flow"); case NozzleFlowType::S_FLOW: return _L("Standard"); case NozzleFlowType::U_FLOW: return _L("TPU High Flow"); + case NozzleFlowType::E_FLOW: return _L("E3D High Flow"); default: break; } @@ -61,6 +64,7 @@ std::string DevNozzle::GetNozzleFlowTypeString(NozzleFlowType type) case NozzleFlowType::H_FLOW: return "High Flow"; case NozzleFlowType::S_FLOW: return "Standard"; case NozzleFlowType::U_FLOW: return "TPU High Flow"; + case NozzleFlowType::E_FLOW: return "E3D High Flow"; default: return "Unknown"; } } @@ -73,6 +77,7 @@ std::string DevNozzle::ToNozzleFlowString(const NozzleFlowType& type) case NozzleFlowType::S_FLOW: return "Standard"; case NozzleFlowType::H_FLOW: return "High Flow"; case NozzleFlowType::U_FLOW: return "TPU High Flow"; + case NozzleFlowType::E_FLOW: return "E3D High Flow"; default: return std::string(); } } @@ -408,6 +413,7 @@ static unordered_map _str2_nozzle_flow_type = { {"X", NozzleFlowType::S_FLOW}, {"E", NozzleFlowType::H_FLOW}, // E3D high-flow {"U", NozzleFlowType::U_FLOW}, // TPU 1.75 high-flow -> nvtTPUHighFlow + {"B", NozzleFlowType::E_FLOW}, // E3D High Flow -> nvtE3DHighFlow }; static unordered_map _str2_nozzle_type = { diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h index 8603baeaaf..168cb94116 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h @@ -12,8 +12,9 @@ // Device flow-type mapping note (nozzle rack): the device U_FLOW value maps to nvtTPUHighFlow // (TPU High Flow), so a device-synced TPU-HF rack resolves to nvtTPUHighFlow and the H2C -// change_filament_gcode TPU-kit branch can activate. nvtHybrid is a slicer-only sentinel with no -// device representation, so it stays out of these device flow-type conversions. +// change_filament_gcode TPU-kit branch can activate. E_FLOW maps to nvtE3DHighFlow. nvtHybrid is a +// slicer-only sentinel with no device representation, so it stays out of these device flow-type +// conversions. // // GetExtruderNozzleInfo (and its ExtruderNozzleInfos aggregate) is intentionally omitted here; // the SelectMachine slicing-vs-installed nozzle comparison collects its per-extruder NozzleDef @@ -36,13 +37,13 @@ namespace Slic3r float m_diameter = 0.0f;// unknown until reported by the printer public: - // flow/volume conversions (Standard / High Flow / TPU High Flow) + // flow/volume conversions (Standard / High Flow / TPU High Flow / E3D High Flow) static NozzleFlowType ToNozzleFlowType(const NozzleVolumeType& type); static NozzleVolumeType ToNozzleVolumeType(const NozzleFlowType& type); static wxString GetNozzleFlowTypeStr(NozzleFlowType type); - static std::string GetNozzleFlowTypeString(NozzleFlowType type);// untranslated literal ("High Flow"/"Standard"/"TPU High Flow") — the filament blacklist JSON matches these raw strings, so it must NOT use the translated GetNozzleFlowTypeStr (would break non-English locales) - static std::string ToNozzleFlowString(const NozzleFlowType& type);// untranslated "Standard"/"High Flow"/"TPU High Flow" ("" for none) — the raw literal serialized into the get_auto_nozzle_mapping payload + static std::string GetNozzleFlowTypeString(NozzleFlowType type);// untranslated literal ("High Flow"/"Standard"/"TPU High Flow"/"E3D High Flow") — the filament blacklist JSON matches these raw strings, so it must NOT use the translated GetNozzleFlowTypeStr (would break non-English locales) + static std::string ToNozzleFlowString(const NozzleFlowType& type);// untranslated "Standard"/"High Flow"/"TPU High Flow"/"E3D High Flow" ("" for none) — the raw literal serialized into the get_auto_nozzle_mapping payload static wxString GetNozzleTypeStr(NozzleType type); public: diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 6bd690e9a6..6c09e05f48 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -347,6 +347,10 @@ static wxString _generate_nozzle_id(NozzleVolumeType nozzle_type, const std::str nozzle_id += "H"; break; } + case NozzleVolumeType::nvtE3DHighFlow: { + nozzle_id += "B"; + break; + } default: nozzle_id += "H"; break; @@ -368,6 +372,8 @@ NozzleVolumeType convert_to_nozzle_type(const std::string &str) res = NozzleVolumeType::nvtStandard; else if (str[1] == 'H') res = NozzleVolumeType::nvtHighFlow; + else if (str[1] == 'B') + res = NozzleVolumeType::nvtE3DHighFlow; return res; } diff --git a/src/slic3r/GUI/DragDropPanel.cpp b/src/slic3r/GUI/DragDropPanel.cpp index 0c1371c307..41c31d927b 100644 --- a/src/slic3r/GUI/DragDropPanel.cpp +++ b/src/slic3r/GUI/DragDropPanel.cpp @@ -566,7 +566,8 @@ std::vector SeparatedDragDropPanel::GetHighFlowFilaments() const const int right_eid = 1; if (nozzle_volumes->values.size() > right_eid) { int volume_type = nozzle_volumes->values[right_eid]; - if (volume_type == static_cast(NozzleVolumeType::nvtHighFlow)) { + if (volume_type == static_cast(NozzleVolumeType::nvtHighFlow) || + volume_type == static_cast(NozzleVolumeType::nvtE3DHighFlow)) { return m_unified_panel->GetAllFilaments(); } } diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index 0f3cc7217d..bd7d42333b 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -185,6 +185,12 @@ std::vector FilamentMapManualPanel::GetFilamentVolumeMaps() const auto preset_bundle = wxGetApp().preset_bundle; auto proj_config = preset_bundle->project_config; auto nozzle_volume_values = proj_config.option("nozzle_volume_type")->values; + // The high-flow panel of the right extruder also holds an E3D High Flow nozzle; keep that type + // instead of writing plain High Flow, which the extruder does not have. + const int right_extruder_id = 1; + const bool right_e3d_high_flow = nozzle_volume_values.size() > right_extruder_id && + nozzle_volume_values[right_extruder_id] == static_cast(NozzleVolumeType::nvtE3DHighFlow); + const int right_high_flow_volume = static_cast(right_e3d_high_flow ? NozzleVolumeType::nvtE3DHighFlow : NozzleVolumeType::nvtHighFlow); for (int i = 0; i < (int) volume_map.size(); ++i) { int filament_id = i + 1; @@ -199,7 +205,7 @@ std::vector FilamentMapManualPanel::GetFilamentVolumeMaps() const } } else if (std::find(right_high_flow_filaments.begin(), right_high_flow_filaments.end(), filament_id) != right_high_flow_filaments.end()) { - volume_map[i] = static_cast(NozzleVolumeType::nvtHighFlow); + volume_map[i] = right_high_flow_volume; } else if (std::find(right_standard_filaments.begin(), right_standard_filaments.end(), filament_id) != right_standard_filaments.end()) { volume_map[i] = static_cast(NozzleVolumeType::nvtStandard); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 951739e213..3a61a95dfd 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -605,15 +605,50 @@ private: bool m_enabled{false}; }; +// The nozzle rows are set in the small body font their "T1" prefix and diameter readout use, so the +// combos of a row drop from the Body_14 they are created with to match, instead of towering over +// the labels next to them. +static void use_nozzle_row_font(ComboBox *combo) +{ + // A read-only combo draws its value with the font of the TextInput it is built on, and its + // dropped list carries a font of its own. + combo->SetFont(Label::Body_10); + combo->GetDropDown().SetFont(Label::Body_10); + + // A row is as tall as the tags of the variant switch: a line of Body_10 text plus the 3 points of + // padding they put above and below it. TextInput::messureSize() instead sizes a combo as its + // (hidden) text control plus 8, and on macOS that control's best height is a fixed 16 points + // whatever font it carries, so the box would keep the height of the Body_14 it was created with. + // Handing the control the height the row asks for, less those 8 points, keeps messureSize()'s own + // arithmetic landing on the small box however often it re-measures. + const int row_height = combo->GetTextExtent("0.4 mm").y + 2 * combo->FromDIP(3); + auto *text_ctrl = combo->GetTextCtrl(); + text_ctrl->SetFont(Label::Body_10); + text_ctrl->SetInitialSize(wxSize(text_ctrl->GetBestSize().x, row_height - 8)); + + combo->SetMinSize(wxSize(combo->GetMinSize().x, row_height)); + combo->SetSize(wxSize(combo->GetSize().x, row_height)); +} + struct ExtruderGroup : StaticBox { + // One nozzle row: the tool prefix ("T1"…"Tn", shown only when the group lists several + // extruders) plus the nozzle readout and flow combo of a single extruder. Rows are appended on + // demand and never destroyed, so an event handler may capture its row index for the lifetime + // of the group. + struct NozzleRow + { + Label * prefix = nullptr; + Label * diameter_label = nullptr; // read-only nozzle diameter of this extruder + ComboBox * flow = nullptr; + }; + ExtruderGroup(wxWindow * parent, int index, wxString const &title); wxBoxSizer * sizer = nullptr; HoverLabel * hover_label = nullptr; wxStaticText* ams_label{nullptr}; ScalableButton * btn_edit = nullptr; ComboBox * combo_diameter = nullptr; - ComboBox * combo_flow = nullptr; AMSPreview * ams[4] = {nullptr}; wxStaticText *ams_not_installed_msg{nullptr}; ScalableButton * btn_up{nullptr}; @@ -627,6 +662,23 @@ struct ExtruderGroup : StaticBox std::vector ams_1; wxString diameter; + std::vector rows; // rows[0] always exists, one row per extruder when multi + size_t nozzle_row_count = 0; // rows currently shown + wxBoxSizer * row_columns[2] = {}; // row i is dealt into column i % 2 + int group_index = -1; // ctor index, the extruder a single-row group edits + + // Show `count` nozzle rows, one per extruder, each prefixed with T when count > 1. + void SetNozzleRowCount(size_t count); + size_t NozzleRowCount() const { return nozzle_row_count; } + // Nozzle diameter readout of the shown rows, one value per extruder. A listing card cannot edit + // it: the diameter belongs to the machine variant the printer preset selects, not to the extruder. + void SetRowDiameters(const std::vector &diameters); + + NozzleRow create_nozzle_row(); + // Widths the prefix and diameter labels of the visible rows so that the flow combos of a column + // line up. + void update_row_widths(); + void set_ams_count(int n4, int n1) { if (n4 == ams_n4 && n1 == ams_n1) @@ -657,7 +709,12 @@ struct ExtruderGroup : StaticBox btn_up->msw_rescale(); btn_down->msw_rescale(); combo_diameter->Rescale(); - combo_flow->Rescale(); + for (const NozzleRow &row : rows) { + row.prefix->SetFont(Label::Body_10.Bold()); + row.diameter_label->SetFont(Label::Body_10); + row.flow->Rescale(); + } + update_row_widths(); for (int i = 0; i < 4; ++i) ams[i]->msw_rescale(); } @@ -668,6 +725,10 @@ struct ExtruderGroup : StaticBox hover_label->sys_color_changed(); if (btn_edit) btn_edit->SetBackgroundColour(extruder_group_chip_bg()); + for (const NozzleRow &row : rows) { + row.prefix->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); + row.diameter_label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); + } Refresh(); } }; @@ -691,11 +752,12 @@ struct Sidebar::priv ScalableButton * btn_edit_printer = nullptr; ScalableButton * btn_connect_printer = nullptr; - // Nozzle diameter + // Printer variant switch, titled "Variant": the combo lists the variants (nozzle sizes) of the + // current machine model and picking one switches the printer preset. StaticBox * panel_nozzle_dia = nullptr; Label * label_nozzle_title= nullptr; ComboBox * combo_nozzle_dia = nullptr; - Label * label_nozzle_type = nullptr; + Label * label_nozzle_type = nullptr; // read-only nozzle material, one-row layouts only // Printer - bed StaticBox * panel_printer_bed = nullptr; @@ -809,6 +871,8 @@ struct Sidebar::priv // otherwise reuses the app_config-cached option when the machine's nozzle config is unchanged. std::optional get_nozzle_options(MachineObject* obj, int extruder_count, bool support_multi_nozzle, bool is_manual); bool switch_diameter(bool single); + // Switch to the printer preset offering `diameter`. + bool switch_diameter_to(const wxString &diameter); void update_sync_status(const MachineObject* obj); // Filament Track Switch (H2-family accessory): true only when the connected printer is the @@ -918,11 +982,19 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) int extruder_count = 0; const bool has_flow_variant = cfg.support_different_extruders(extruder_count); - panel_nozzle_dia->Show(!has_flow_variant); - extruder_single_sizer->Show(has_flow_variant); + // ORCA: a non-Bambu printer with several extruders lists one nozzle row per tool; Bambu's own + // multi-extruder printers keep the left/right pair above. + const bool multi_extruder_rows = !preset_bundle.is_bbl_vendor() && extruder_count > 1; + + // The variant box switches the machine variant. The card below lists the nozzles when there + // are flow variants to choose or several extruders to show; otherwise the box says it all. + panel_nozzle_dia->Show(true); + extruder_single_sizer->Show(has_flow_variant || multi_extruder_rows); + single_extruder->SetNozzleRowCount(multi_extruder_rows ? size_t(extruder_count) : 1); } else { panel_nozzle_dia->Show(false); extruder_single_sizer->Show(false); + single_extruder->SetNozzleRowCount(1); } // ORCA ensure printer section is visible after changing printer from printer selection dialog @@ -1319,7 +1391,7 @@ public: }; ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title) - : StaticBox(parent) + : StaticBox(parent), group_index(index) { SetFont(Label::Body_10); SetForegroundColour(wxColour("#CECECE")); @@ -1332,29 +1404,13 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title hover_label = new HoverLabel(this, title); hover_label->SetPosition(wxPoint(FromDIP(PRINTER_PANEL_RADIUS), 0)); // position it without putting in a sizer so it will look like title - // Nozzle + // Nozzle. Only the dual left/right cards show this combo: it is how they ask which nozzle the + // project should print with. Every other card reads the diameter out as text. auto combo_diameter = new ComboBox(this, wxID_ANY, wxString(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); this->combo_diameter = combo_diameter; combo_diameter->SetToolTip(_L("Diameter")); - - // Flow - auto combo_flow = new ComboBox(this, wxID_ANY, wxString(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); - combo_flow->GetDropDown().SetUseContentWidth(true); - combo_flow->Bind(wxEVT_COMBOBOX, [index, combo_flow](wxCommandEvent &evt) { - auto printer_tab = dynamic_cast(wxGetApp().get_tab(Preset::TYPE_PRINTER)); - NozzleVolumeType volume_type = NozzleVolumeType(intptr_t(combo_flow->GetClientData(evt.GetInt()))); - printer_tab->set_extruder_volume_type(index, volume_type); - auto plater = GUI::wxGetApp().plater(); - if (plater) { - // A new Flow type invalidates the per-filament volume choices stored on the - // plates for this extruder; rewrite them so the next apply/grouping sees the - // selected volume instead of a stale one. - plater->update_filament_volume_map(index, static_cast(volume_type)); - plater->update_machine_sync_status(); - } - }); - this->combo_flow = combo_flow; - combo_flow->SetToolTip(_L("Flow")); + combo_diameter->Show(index >= 0); + use_nozzle_row_font(combo_diameter); // AMS auto ams_panel = new wxPanel(this, wxID_ANY); @@ -1440,10 +1496,6 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title btn_down->Hide(); wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL); - wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); - - hsizer->Add(combo_diameter, 1, wxRIGHT, FromDIP(5)); - hsizer->Add(combo_flow , 1); vsizer->AddSpacer(FromDIP(16)); // spacing for title and control if (index < 0) { @@ -1452,14 +1504,137 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title vsizer->Add(ams_panel, 0, wxEXPAND | wxLEFT | wxRIGHT , FromDIP(5)); vsizer->AddSpacer(FromDIP(2)); } - vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, FromDIP(5)); + // Nozzle rows. The first one is the only one for a printer whose nozzles are not listed + // individually; a multi-extruder printer grows one row per tool (see SetNozzleRowCount). + // The rows are dealt into two columns, which halves the height of a long tool list; the second + // column empties itself when there is a single row, so a one-row card still spans the width. + auto rows_sizer = new wxBoxSizer(wxHORIZONTAL); + for (wxBoxSizer *&column : row_columns) { + column = new wxBoxSizer(wxVERTICAL); + rows_sizer->Add(column, 1, wxEXPAND); + } + vsizer->Add(rows_sizer, 0, wxEXPAND); + sizer = vsizer; // the floating filament-switch icon positions itself against this card SetSizer(vsizer); + SetNozzleRowCount(1); + Layout(); AMSCountPopupWindow::UpdateAMSCount(index < 0 ? 0 : index, this); } +ExtruderGroup::NozzleRow ExtruderGroup::create_nozzle_row() +{ + const size_t row_index = rows.size(); + NozzleRow row; + + row.prefix = new Label(this, Label::Body_10.Bold()); + row.prefix->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); + row.prefix->SetLabelText(wxString::Format("T%d", int(row_index) + 1)); + row.prefix->Hide(); + + row.diameter_label = new Label(this, Label::Body_10); + row.diameter_label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); + row.diameter_label->Hide(); + + auto combo_flow = new ComboBox(this, wxID_ANY, wxString(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); + combo_flow->GetDropDown().SetUseContentWidth(true); + combo_flow->Bind(wxEVT_COMBOBOX, [this, row_index, combo_flow](wxCommandEvent &evt) { + // A one-row card edits the extruder it was created for, a multi-row card one extruder per row. + const int index = nozzle_row_count > 1 ? int(row_index) : group_index; + auto printer_tab = dynamic_cast(wxGetApp().get_tab(Preset::TYPE_PRINTER)); + NozzleVolumeType volume_type = NozzleVolumeType(intptr_t(combo_flow->GetClientData(evt.GetInt()))); + printer_tab->set_extruder_volume_type(index, volume_type); + auto plater = GUI::wxGetApp().plater(); + if (plater) { + // A new Flow type invalidates the per-filament volume choices stored on the + // plates for this extruder; rewrite them so the next apply/grouping sees the + // selected volume instead of a stale one. + plater->update_filament_volume_map(index, static_cast(volume_type)); + plater->update_machine_sync_status(); + } + }); + combo_flow->SetToolTip(_L("Flow")); + row.flow = combo_flow; + use_nozzle_row_font(combo_flow); + + auto row_sizer = new wxBoxSizer(wxHORIZONTAL); + row_sizer->Add(row.prefix, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(3)); + if (row_index == 0) + row_sizer->Add(combo_diameter, 1, wxRIGHT, FromDIP(5)); + row_sizer->Add(row.diameter_label, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(5)); + row_sizer->Add(row.flow, 1); + // Row-major: T1 T2 on the first line, T3 T4 on the second, and so on. + row_columns[row_index % 2]->Add(row_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, FromDIP(5)); + + return row; +} + +void ExtruderGroup::update_row_widths() +{ + // Measured from the rows on screen rather than fixed, so no gap is reserved for a "T10" or a + // "0.25 mm" that no row carries while the flow combos of a column still line up. + wxSize prefix_width(0, -1); + wxSize diameter_width(0, -1); + for (const NozzleRow &row : rows) { + if (row.prefix->IsShown()) + prefix_width.x = std::max(prefix_width.x, row.prefix->GetTextExtent(row.prefix->GetLabelText()).x); + if (row.diameter_label->IsShown()) + diameter_width.x = std::max(diameter_width.x, row.diameter_label->GetTextExtent(row.diameter_label->GetLabelText()).x); + } + for (const NozzleRow &row : rows) { + row.prefix->SetMinSize(prefix_width); + row.diameter_label->SetMinSize(diameter_width); + } +} + +void ExtruderGroup::SetRowDiameters(const std::vector &diameters) +{ + for (size_t i = 0; i < std::min(nozzle_row_count, diameters.size()); ++i) { + // Spelled like the calibration dialogs spell a nozzle diameter, "0.4 mm". + const wxString text = from_u8(get_diameter_string(diameters[i])) + " mm"; + rows[i].diameter_label->SetLabelText(text); + rows[i].diameter_label->SetToolTip(text); + } + update_row_widths(); + Layout(); +} + +void ExtruderGroup::SetNozzleRowCount(size_t count) +{ + const size_t row_count = std::min(count, size_t(MAXIMUM_EXTRUDER_NUMBER)); + if (row_count == nozzle_row_count) + return; + nozzle_row_count = row_count; + + // Every row names its tool as soon as there is more than one, so a single-nozzle card keeps the + // plain "Nozzle" look. A row is shown by showing its widgets: a sizer item holding a sub-sizer + // reports itself as shown while any of its windows is, so hiding the sub-sizer alone would + // leave the row in the layout. + for (size_t i = 0; i < row_count; ++i) { + if (i >= rows.size()) + rows.push_back(create_nozzle_row()); + rows[i].prefix->Show(row_count > 1); + rows[i].diameter_label->Show(group_index < 0); // the dual left/right cards show combo_diameter + // The flow combo's own visibility is decided with its choices, see update_extruder_variant. + } + for (size_t i = row_count; i < rows.size(); ++i) { + rows[i].prefix->Hide(); + rows[i].diameter_label->Hide(); + rows[i].flow->Hide(); + } + + // The rows just changed: re-measure them, then let the card and its containers give it the new room. + update_row_widths(); + Layout(); + if (wxWindow *parent = GetParent()) { + parent->Layout(); + if (wxWindow *grand_parent = parent->GetParent()) + grand_parent->Layout(); + } +} + void ExtruderGroup::update_ams() { static AMSinfo info4; @@ -1588,9 +1763,19 @@ bool Sidebar::priv::switch_diameter(bool single) diameter = diameter_left; } } - + + return switch_diameter_to(diameter); +} + +bool Sidebar::priv::switch_diameter_to(const wxString &diameter) +{ // ORCA: Check if the selected diameter matches the current nozzle diameter in the config Preset& printer_preset = wxGetApp().preset_bundle->printers.get_edited_preset(); + // The combo lists printer variants, and the variant of a mixed-nozzle machine ("0.4+0.6") is no + // single extruder's diameter, so the preset's own variant answers first. + if (printer_preset.config.opt_string("printer_variant") == diameter.ToStdString()) { + return true; + } auto* nozzle_diameter = dynamic_cast(printer_preset.config.option("nozzle_diameter")); if (nozzle_diameter && nozzle_diameter->size() > 0) { auto current_nozzle_dia = get_diameter_string(nozzle_diameter->values[0]); @@ -2679,7 +2864,8 @@ Sidebar::Sidebar(Plater *parent) p->combo_nozzle_dia->wxEvtHandler::ProcessEvent(evt); }); - p->label_nozzle_title = new Label(p->panel_nozzle_dia, _L("Nozzle"), LB_PROPAGATE_MOUSE_EVENT); + // "Variant", not "Nozzle": picking one switches the printer preset (see panel_nozzle_dia). + p->label_nozzle_title = new Label(p->panel_nozzle_dia, _L("Variant"), LB_PROPAGATE_MOUSE_EVENT); p->label_nozzle_title->SetFont(Label::Body_10); p->combo_nozzle_dia = new ComboBox(p->panel_nozzle_dia, wxID_ANY, wxString(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); @@ -2688,12 +2874,15 @@ Sidebar::Sidebar(Plater *parent) p->combo_nozzle_dia->SetMinSize(FromDIP(wxSize(PRINTER_PANEL_SIZE.GetWidth() - 4, 26))); // requires a static value in here p->combo_nozzle_dia->SetMaxSize(FromDIP(wxSize(PRINTER_PANEL_SIZE.GetWidth() - 4, 26))); // using -1 with wxEXPAND has issues p->combo_nozzle_dia->Bind(wxEVT_COMBOBOX, [this](auto &e) { - auto evt_combo = (*p->single_extruder).combo_diameter; - evt_combo->SetSelection(e.GetSelection()); - wxCommandEvent evt(wxEVT_COMBOBOX, evt_combo->GetId()); - evt.SetEventObject(evt_combo); - evt.SetInt(e.GetSelection()); - wxPostEvent(evt_combo, evt); + // This box is the machine-variant selector, so it switches the printer preset directly + // instead of feeding an extruder card's combo. Deferred, because switching preset + // rebuilds this very combo. + const wxString diameter = p->combo_nozzle_dia->GetValue(); + p->combo_nozzle_dia->CallAfter([this, diameter]() { + p->is_switching_diameter = true; + p->switch_diameter_to(diameter); + p->is_switching_diameter = false; + }); e.Skip(); }); // ORCA paint whole combobox on focus @@ -3673,8 +3862,16 @@ void Sidebar::update_presets(Preset::Type preset_type) auto diameters = wxGetApp().preset_bundle->printers.diameters_of_selected_printer(); auto diameter = printer_preset.config.opt_string("printer_variant"); auto extruder_max_nozzle_count = printer_preset.config.option("extruder_max_nozzle_count"); - auto update_extruder_variant = [printer_model, extruders_def, extruders, nozzle_volumes_def, nozzle_volumes, extruder_variants,diameter,extruder_max_nozzle_count](ExtruderGroup & extruder, int index) { - extruder.combo_flow->Clear(); + auto update_extruder_variant = [printer_model, extruders_def, extruders, nozzle_volumes_def, nozzle_volumes, extruder_variants,diameter,extruder_max_nozzle_count](ExtruderGroup & extruder, size_t row, int index) { + ComboBox *combo_flow = extruder.rows[row].flow; + combo_flow->Clear(); + // A profile may leave the per-extruder lists shorter than the nozzle count (they are + // padded when the printer is loaded, but a hand-written preset need not be). + if (index >= int(extruder_variants->values.size()) || index >= int(extruders->values.size()) || + index >= int(nozzle_volumes->values.size())) { + combo_flow->Hide(); + return; + } auto type = extruders_def->enum_labels[extruders->values[index]]; int select = -1; for (size_t i = 0; i < nozzle_volumes_def->enum_labels.size(); ++i) { @@ -3684,26 +3881,36 @@ void Sidebar::update_presets(Preset::Type preset_type) if (boost::algorithm::contains(extruder_variants->values[index], type + " " + nozzle_volumes_def->enum_labels[i]) || (extruder_max_nozzle_count->get_at(index) > 1 && extruder_max_nozzle_count->get_at(index) != ConfigOptionIntsNullable::nil_value() && nozzle_volumes_def->enum_keys_map->at(nozzle_volumes_def->enum_values[i]) == nvtHybrid)) { - if (nozzle_volumes_def->enum_keys_map->at(nozzle_volumes_def->enum_values[i]) == NozzleVolumeType::nvtHighFlow &&(diameter == "0.2" || + auto cur_volume_type = nozzle_volumes_def->enum_keys_map->at(nozzle_volumes_def->enum_values[i]); + // Defensive: profiles restrict E3D to 0.4 / 0.6; keep it out elsewhere. + if (cur_volume_type == NozzleVolumeType::nvtE3DHighFlow && diameter != "0.4" && diameter != "0.6") + continue; + if (cur_volume_type == NozzleVolumeType::nvtHighFlow && (diameter == "0.2" || is_skip_high_flow_printer(printer_model))) continue; - if (nozzle_volumes->values[index] == i) - select = extruder.combo_flow->GetCount(); - extruder.combo_flow->Append(_L(nozzle_volumes_def->enum_labels[i]), {}, (void*)i); + // The client data is the enum value, not the label position: E3D High Flow is 5 + // but sits at position 4, and a position would write an invalid type. + if (nozzle_volumes->values[index] == cur_volume_type) + select = combo_flow->GetCount(); + combo_flow->Append(_L(nozzle_volumes_def->enum_labels[i]), {}, (void*)(intptr_t)cur_volume_type); } } if (select == -1) - select = extruder.combo_flow->GetCount() - 1; - extruder.combo_flow->SetSelection(select); + select = combo_flow->GetCount() - 1; + combo_flow->SetSelection(select); + // No flow variant for this extruder: the diameter keeps the whole row. + combo_flow->Show(combo_flow->GetCount() > 0); }; auto update_extruder_diameter = [&diameters, &nozzle_diameter](int extruder_index,ExtruderGroup & extruder) { extruder.combo_diameter->Clear(); + if (extruder_index >= int(nozzle_diameter->values.size())) + return; int select = -1; // ORCA get the actual nozzle diameter from printer config auto nozzle_dia = get_diameter_string(nozzle_diameter->values[extruder_index]); // ORCA try to add nozzle diameter from config if list is empty. fixes blank nozzle combo box when preset has no alias - if(diameters[0].empty() && !nozzle_dia.empty()){ + if(!diameters.empty() && diameters[0].empty() && !nozzle_dia.empty()){ diameters[0] = nozzle_dia; } // Orca: Check if the actual nozzle diameter exists in the list, if not add it as a custom option @@ -3719,14 +3926,15 @@ void Sidebar::update_presets(Preset::Type preset_type) extruder.diameter = nozzle_dia; }; auto image_path = get_cur_select_bed_image(); - if (is_dual_extruder) { + const bool multi_extruder_rows = p->single_extruder->NozzleRowCount() > 1; + if (is_dual_extruder && !multi_extruder_rows) { std::string printer_type = printer_preset.get_printer_type(wxGetApp().preset_bundle); p->left_extruder->SetTitle(_L(DevPrinterConfigUtil::get_toolhead_display_name(printer_type, DEPUTY_EXTRUDER_ID, ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase))); p->right_extruder->SetTitle(_L(DevPrinterConfigUtil::get_toolhead_display_name(printer_type, MAIN_EXTRUDER_ID, ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase))); AMSCountPopupWindow::UpdateAMSCount(0, p->left_extruder); AMSCountPopupWindow::UpdateAMSCount(1, p->right_extruder); - update_extruder_variant(*p->left_extruder, 0); - update_extruder_variant(*p->right_extruder, 1); + update_extruder_variant(*p->left_extruder, 0, 0); + update_extruder_variant(*p->right_extruder, 0, 1); //if (!p->is_switching_diameter) { update_extruder_diameter(0, *p->left_extruder); update_extruder_diameter(1, *p->right_extruder); @@ -3734,15 +3942,27 @@ void Sidebar::update_presets(Preset::Type preset_type) p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, PRINTER_THUMBNAIL_SIZE.GetHeight())); } else { AMSCountPopupWindow::UpdateAMSCount(0, p->single_extruder); - update_extruder_variant(*p->single_extruder, 0); + for (size_t row = 0; row < p->single_extruder->NozzleRowCount(); ++row) + update_extruder_variant(*p->single_extruder, row, int(row)); //if (!p->is_switching_diameter) update_extruder_diameter(0, *p->single_extruder); + // The card reads the nozzles out, the variant box above is what switches the machine. + p->single_extruder->SetRowDiameters(nozzle_diameter->values); + if (multi_extruder_rows) { + // The hidden left/right cards keep mirroring the first extruders' diameters: the + // device sync path (a connected Bambu printer or a printer agent) still reads them. + update_extruder_diameter(0, *p->left_extruder); + update_extruder_diameter(1, *p->right_extruder); + } // ORCA sync unified nozzle combo box p->combo_nozzle_dia->Clear(); for (size_t i = 0; i < diameters.size(); ++i) p->combo_nozzle_dia->Append(diameters[i], {}); - p->combo_nozzle_dia->SetSelection((*p->single_extruder).combo_diameter->GetSelection()); + // Prefer the variant the preset names: a mixed-nozzle machine reads "0.4+0.6", which is + // no single extruder's diameter. + const int variant = p->combo_nozzle_dia->FindString(diameter); + p->combo_nozzle_dia->SetSelection(variant != wxNOT_FOUND ? variant : (*p->single_extruder).combo_diameter->GetSelection()); // ORCA update nozzle type const auto& full_config = wxGetApp().preset_bundle->full_config(); diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index d68bd24ccc..f03bcb1d29 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -1793,6 +1793,7 @@ wxString PrinterPartsDialog::GetString(NozzleFlowType nozzle_flow_type) const { case Slic3r::S_FLOW: return _L("Standard"); case Slic3r::H_FLOW: return _L("High flow"); case Slic3r::U_FLOW: return _L("TPU High flow"); + case Slic3r::E_FLOW: return _L("E3D High Flow"); default: break; } diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index a3b83bd643..04eb2b1612 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -75,6 +75,9 @@ std::string get_nozzle_volume_type_cloud_string(NozzleVolumeType nozzle_volume_t else if (nozzle_volume_type == NozzleVolumeType::nvtTPUHighFlow) { return "tpu_high_flow"; } + else if (nozzle_volume_type == NozzleVolumeType::nvtE3DHighFlow) { + return "e3d_high_flow"; + } else if (nozzle_volume_type == NozzleVolumeType::nvtHybrid) { // to be supported return "hybrid_flow"; diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 19b1ddc568..07c75e809a 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1516,6 +1516,8 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(DevExtderSystem data, wxString &err used_extruders_flow[used_extruders[i]] = "Standard"; } else if (nozzle_volume_type == NozzleVolumeType::nvtTPUHighFlow) { used_extruders_flow[used_extruders[i]] = "TPU High Flow"; + } else if (nozzle_volume_type == NozzleVolumeType::nvtE3DHighFlow) { + used_extruders_flow[used_extruders[i]] = "E3D High Flow"; } else { used_extruders_flow[used_extruders[i]] = "High Flow"; } @@ -1533,6 +1535,8 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(DevExtderSystem data, wxString &err flow_type_of_machine.push_back("Standard"); } else if (it->GetNozzleFlowType() == NozzleFlowType::U_FLOW) { flow_type_of_machine.push_back("TPU High Flow"); + } else if (it->GetNozzleFlowType() == NozzleFlowType::E_FLOW) { + flow_type_of_machine.push_back("E3D High Flow"); } } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index bf348f856f..b5b93fca17 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -506,7 +506,7 @@ void Tab::create_preset_tab() if (dynamic_cast(this) || dynamic_cast(this)) { m_extruder_switch = new MultiSwitchButton(panel); - m_extruder_switch->SetMaxSize({em_unit(this) * 40, -1}); + m_extruder_switch->SetFitToOptions(); m_extruder_switch->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this](auto &evt) { evt.Skip(); int selection = evt.GetInt(); @@ -539,7 +539,8 @@ void Tab::create_preset_tab() auto right_sizer = new wxBoxSizer(wxHORIZONTAL); m_variant_sizer->AddStretchSpacer(1); - m_variant_sizer->Add(m_extruder_switch, 0, wxALIGN_CENTER, 0); + // Orca: proportion 1 lets a narrow row squeeze the switch, which then scrolls its buttons. + m_variant_sizer->Add(m_extruder_switch, 1, wxALIGN_CENTER, 0); m_variant_sizer->Add(right_sizer, 1, wxALIGN_CENTER); right_sizer->AddStretchSpacer(1); right_sizer->Add(m_extruder_sync_box, 0, wxALIGN_CENTER | wxRIGHT, m_em_unit); @@ -8172,7 +8173,7 @@ void Tab::update_extruder_variants(int extruder_id, bool reload) // Orca: a non-Bambu dual-nozzle printer has two extruders but a single variant column, so // the nozzle switch and sync button have nothing to act on. Only enable with real variants. - if (extruder_nums == 2 && m_preset_bundle->support_different_extruders()) { + if (extruder_nums >= 2 && m_preset_bundle->support_different_extruders()) { auto options = generate_extruder_options(); m_extruder_switch->SetOptions(options); @@ -8219,6 +8220,25 @@ void Tab::update_extruder_variants(int extruder_id, bool reload) } } +// The variant switch tags are the narrowest place a volume type is named, so they abbreviate it; +// the flow combo boxes and the Printer tab's parameter labels keep the full names. +static wxString short_nozzle_volume_name(const std::string &volume_name) +{ + // Hybrid has no entry on purpose: it is never a variant string, and the switch lists its two + // sub-nozzle types as separate tags (see generate_extruder_options). + if (volume_name == "Standard") + return "SF"; + if (volume_name == "High Flow") + return "HF"; + if (volume_name == "TPU High Flow") + return "TPU HF"; + if (volume_name == "E3D High Flow") + return "E3D HF"; + if (volume_name == "Extra High Flow") + return "XHF"; + return from_u8(volume_name); +} + std::vector Tab::generate_extruder_options() { std::vector options; @@ -8259,7 +8279,7 @@ std::vector Tab::generate_extruder_options() nozzle = ""; } } - options.push_back(wxString::Format(_L("%s: %s"), _L(drive), _L(nozzle))); + options.push_back(wxString::Format(_L("%s: %s"), _L(drive), short_nozzle_volume_name(nozzle))); } return options; } @@ -8273,18 +8293,22 @@ std::vector Tab::generate_extruder_options() } std::string pt = m_preset_bundle->printers.get_edited_preset().get_printer_type(m_preset_bundle); + // Orca: the main/deputy toolhead names describe a dual-nozzle printer, where extruder 0 is the + // left (deputy) and extruder 1 the right (main) nozzle. From three extruders on the tools are + // interchangeable, so name them by index instead of repeating one side. for (int i = 0; i < extruder_nums; ++i) { - int ext_id = (i == 0) ? DEPUTY_EXTRUDER_ID : MAIN_EXTRUDER_ID; - wxString extruder_name = _L(DevPrinterConfigUtil::get_toolhead_display_name( - pt, ext_id, ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase, true)); + wxString extruder_name = extruder_nums > 2 ? wxString::Format("T%d", i + 1) : + _L(DevPrinterConfigUtil::get_toolhead_display_name( + pt, (i == 0) ? DEPUTY_EXTRUDER_ID : MAIN_EXTRUDER_ID, + ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase, true)); NozzleVolumeType volume_type = NozzleVolumeType(nozzle_volumes->values[i]); if (volume_type == NozzleVolumeType::nvtHybrid) { - options.push_back(wxString::Format(_L("%s: %s"), extruder_name, _L("Standard"))); - options.push_back(wxString::Format(_L("%s: %s"), extruder_name, _L("High Flow"))); + options.push_back(wxString::Format(_L("%s: %s"), extruder_name, short_nozzle_volume_name(get_nozzle_volume_type_string(NozzleVolumeType::nvtStandard)))); + options.push_back(wxString::Format(_L("%s: %s"), extruder_name, short_nozzle_volume_name(get_nozzle_volume_type_string(NozzleVolumeType::nvtHighFlow)))); } else { - wxString volume_name = get_nozzle_volume_type_name(volume_type); - options.push_back(wxString::Format(_L("%s: %s"), extruder_name, volume_name)); + options.push_back(wxString::Format(_L("%s: %s"), extruder_name, + short_nozzle_volume_name(get_nozzle_volume_type_string(volume_type)))); } } return options; @@ -8315,7 +8339,10 @@ bool Tab::get_extruder_sync_enable_state(int extruder_id) Preset& printer_preset = m_preset_bundle->printers.get_edited_preset(); auto nozzle_volumes = m_preset_bundle->project_config.option("nozzle_volume_type"); auto extruders = printer_preset.config.option("extruder_type"); - if (nozzle_volumes->values.size() < 2 || extruders->values.size() < 2) { + // Orca: every rule below describes the two toolheads of a dual-nozzle printer as left/right. + // A printer with any other extruder count has no single counterpart to copy to, so it gets no + // sync button (a toolchanger would need a target to be chosen). + if (nozzle_volumes->values.size() != 2 || extruders->values.size() != 2) { return false; } @@ -8456,6 +8483,10 @@ void Tab::sync_excluder() ExtruderType(extruders->values[extruder_id]), nozzle_type, variant_keys.second, stride); }; int active_index = get_current_active_extruder(); + // The button copies to the other toolhead, so it is only offered when that other one exists; + // without this the `1 - active_index` below would index an extruder that is not there. + if (!get_extruder_sync_enable_state(active_index)) + return; auto active_nozzle = get_actual_nozzle_volume_type(active_index); int from_index = get_index_for_extruder(active_index, active_nozzle); int dest_index = get_index_for_extruder(1 - active_index, active_nozzle); diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp index 316389d65c..42659431f0 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp @@ -70,8 +70,8 @@ int getExtruderNozzleCountTotal(PresetBundle *preset_bundle, int extruder_id) // ---- ManualNozzleCountDialog ---------------------------------------------------------------------------------- -ManualNozzleCountDialog::ManualNozzleCountDialog( - wxWindow *parent, NozzleVolumeType volume_type, int standard_count, int highflow_count, int max_nozzle_count, bool force_no_zero) +ManualNozzleCountDialog::ManualNozzleCountDialog(wxWindow *parent, NozzleVolumeType volume_type, int standard_count, int highflow_count, int e3d_count, + int max_nozzle_count, bool force_no_zero, const std::set &supported_types) : DPIDialog(parent, wxID_ANY, _L("Set nozzle count"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { SetBackgroundColour(*wxWHITE); @@ -93,43 +93,39 @@ ManualNozzleCountDialog::ManualNozzleCountDialog( for (int i = 0; i <= max_nozzle_count; ++i) nozzle_choices.Add(wxString::Format("%d", i)); - // A Hybrid extruder mixes Standard and High Flow nozzles, so it gets both count choices; the concrete - // types get exactly one. - if (volume_type == nvtStandard || volume_type == nvtHybrid) { - wxBoxSizer *standard_sizer = new wxBoxSizer(wxHORIZONTAL); - auto standard_label = new wxStaticText(content, wxID_ANY, _L(get_nozzle_volume_type_string(nvtStandard)), wxDefaultPosition, wxSize(FromDIP(100), -1)); - standard_label->SetFont(Label::Body_14); - standard_label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); - standard_sizer->Add(standard_label, 0, wxALIGN_CENTER_VERTICAL); - m_standard_choice = new ComboBox(content, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(80), -1), 0, nullptr, wxCB_READONLY); - std::vector::iterator iter; - for (iter = nozzle_choices.begin(); iter != nozzle_choices.end(); iter++) - m_standard_choice->Append(*iter); - m_standard_choice->SetSelection(standard_count); - standard_sizer->Add(m_standard_choice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(5)); - choice_sizer->Add(standard_sizer, 0, wxTOP | wxRIGHT, FromDIP(15)); - } - if (volume_type == nvtHighFlow || volume_type == nvtHybrid) { - wxBoxSizer *highflow_sizer = new wxBoxSizer(wxHORIZONTAL); - auto highflow_label = new wxStaticText(content, wxID_ANY, _L(get_nozzle_volume_type_string(nvtHighFlow)), wxDefaultPosition, wxSize(FromDIP(100), -1)); - highflow_label->SetFont(Label::Body_14); - highflow_label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); - highflow_sizer->Add(highflow_label, 0, wxALIGN_CENTER_VERTICAL); - m_highflow_choice = new ComboBox(content, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(80), -1), 0, nullptr, wxCB_READONLY); - std::vector::iterator iter; - for (iter = nozzle_choices.begin(); iter != nozzle_choices.end(); iter++) - m_highflow_choice->Append(*iter); - m_highflow_choice->SetSelection(highflow_count); - highflow_sizer->Add(m_highflow_choice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(5)); - choice_sizer->Add(highflow_sizer, 0, wxTOP | wxRIGHT, FromDIP(15)); - } + // A Hybrid extruder mixes several nozzle volume types, so it gets a count choice for each type the + // extruder actually has; a concrete type gets exactly its own, which it supports by definition. + auto shows = [volume_type, &supported_types](NozzleVolumeType type) { + return volume_type == type || (volume_type == nvtHybrid && (supported_types.empty() || supported_types.count(type) > 0)); + }; + auto add_count_choice = [this, content, choice_sizer, &nozzle_choices](NozzleVolumeType type, int count) { + wxBoxSizer *row_sizer = new wxBoxSizer(wxHORIZONTAL); + auto label = new wxStaticText(content, wxID_ANY, _L(get_nozzle_volume_type_string(type)), wxDefaultPosition, wxSize(FromDIP(100), -1)); + label->SetFont(Label::Body_14); + label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636"))); + row_sizer->Add(label, 0, wxALIGN_CENTER_VERTICAL); + auto choice = new ComboBox(content, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(80), -1), 0, nullptr, wxCB_READONLY); + for (const wxString &item : nozzle_choices) + choice->Append(item); + choice->SetSelection(count); + row_sizer->Add(choice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(5)); + choice_sizer->Add(row_sizer, 0, wxTOP | wxRIGHT, FromDIP(15)); + return choice; + }; + if (shows(nvtStandard)) + m_standard_choice = add_count_choice(nvtStandard, standard_count); + if (shows(nvtHighFlow)) + m_highflow_choice = add_count_choice(nvtHighFlow, highflow_count); + if (shows(nvtE3DHighFlow)) + m_e3d_choice = add_count_choice(nvtE3DHighFlow, e3d_count); m_error_label = new wxStaticText(this, wxID_ANY, ""); m_error_label->SetForegroundColour(wxColour("#E14747")); m_error_label->Hide(); - auto update_nozzle_error = [this, force_no_zero, content, max_nozzle_count](int standard_count, int highflow_count) { - const int total_count = standard_count + highflow_count; + auto update_nozzle_error = [this, force_no_zero, content, max_nozzle_count](wxCommandEvent &e) { + // The Hybrid count is the sum over every choice on screen, whatever the extruder's own type. + const int total_count = GetNozzleCount(nvtHybrid); if (0 < total_count && total_count <= max_nozzle_count && m_error_label->IsShown()) { m_error_label->Hide(); m_confirm_btn->Enable(); @@ -145,18 +141,12 @@ ManualNozzleCountDialog::ManualNozzleCountDialog( Layout(); Fit(); } + e.Skip(); }; - if (m_standard_choice) - m_standard_choice->Bind(wxEVT_COMBOBOX, [this, update_nozzle_error](wxCommandEvent &e) { - update_nozzle_error(m_standard_choice->GetSelection(), m_highflow_choice ? m_highflow_choice->GetSelection() : 0); - e.Skip(); - }); - if (m_highflow_choice) - m_highflow_choice->Bind(wxEVT_COMBOBOX, [this, update_nozzle_error](wxCommandEvent &e) { - update_nozzle_error(m_standard_choice ? m_standard_choice->GetSelection() : 0, m_highflow_choice->GetSelection()); - e.Skip(); - }); + for (ComboBox *choice : {m_standard_choice, m_highflow_choice, m_e3d_choice}) + if (choice) + choice->Bind(wxEVT_COMBOBOX, update_nozzle_error); content_sizer->Add(nozzle_icon, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(15)); content_sizer->Add(choice_sizer, 0, wxALIGN_CENTRE_VERTICAL); @@ -181,9 +171,10 @@ int ManualNozzleCountDialog::GetNozzleCount(NozzleVolumeType volume_type) const return m_standard_choice ? m_standard_choice->GetSelection() : 0; if (volume_type == nvtHighFlow) return m_highflow_choice ? m_highflow_choice->GetSelection() : 0; + if (volume_type == nvtE3DHighFlow) + return m_e3d_choice ? m_e3d_choice->GetSelection() : 0; if (volume_type == nvtHybrid) - return (m_standard_choice ? m_standard_choice->GetSelection() : 0) + - (m_highflow_choice ? m_highflow_choice->GetSelection() : 0); + return GetNozzleCount(nvtStandard) + GetNozzleCount(nvtHighFlow) + GetNozzleCount(nvtE3DHighFlow); return 0; } @@ -318,6 +309,7 @@ void manuallySetNozzleCount(int extruder_id) const NozzleVolumeType volume_type = NozzleVolumeType(nozzle_volume_type_opt->values[extruder_id]); const int standard_count = getExtruderNozzleCount(preset_bundle, extruder_id, nvtStandard); const int highflow_count = getExtruderNozzleCount(preset_bundle, extruder_id, nvtHighFlow); + const int e3d_count = getExtruderNozzleCount(preset_bundle, extruder_id, nvtE3DHighFlow); // Require at least one nozzle for a Hybrid extruder (an empty mix is meaningless) and when the other // extruder currently has none. @@ -325,11 +317,19 @@ void manuallySetNozzleCount(int extruder_id) if (nozzle_volume_type_opt->values.size() > 1) force_no_zero |= getExtruderNozzleCountTotal(preset_bundle, 1 - extruder_id) == 0; - ManualNozzleCountDialog dialog(wxGetApp().plater(), volume_type, standard_count, highflow_count, max_nozzle_count->values[extruder_id], force_no_zero); + // The printer profile's variant list is the authority on which volume types an extruder provides. An + // empty set means the profile could not be read, and the dialog then skips filtering instead of hiding + // everything. + const std::set supported_types = + get_extruder_supported_nozzle_volume_types(preset_bundle->printers.get_edited_preset().config, extruder_id); + + ManualNozzleCountDialog dialog(wxGetApp().plater(), volume_type, standard_count, highflow_count, e3d_count, + max_nozzle_count->values[extruder_id], force_no_zero, supported_types); if (dialog.ShowModal() == wxID_OK) { if (volume_type == nvtHybrid) { setExtruderNozzleCount(preset_bundle, extruder_id, nvtStandard, dialog.GetNozzleCount(nvtStandard), true); setExtruderNozzleCount(preset_bundle, extruder_id, nvtHighFlow, dialog.GetNozzleCount(nvtHighFlow), false); + setExtruderNozzleCount(preset_bundle, extruder_id, nvtE3DHighFlow, dialog.GetNozzleCount(nvtE3DHighFlow), false); } else { setExtruderNozzleCount(preset_bundle, extruder_id, volume_type, dialog.GetNozzleCount(volume_type), true); } diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp index 5a3e9374a7..50bd534c72 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -64,7 +65,9 @@ struct NozzleOption class ManualNozzleCountDialog : public DPIDialog { public: - ManualNozzleCountDialog(wxWindow *parent, NozzleVolumeType volume_type, int standard_count, int highflow_count, int max_nozzle_count, bool force_no_zero); + // supported_types lists the volume types the extruder physically provides; an empty set means "unknown", in which case no filtering is applied. + ManualNozzleCountDialog(wxWindow *parent, NozzleVolumeType volume_type, int standard_count, int highflow_count, int e3d_count, int max_nozzle_count, bool force_no_zero, + const std::set &supported_types); ~ManualNozzleCountDialog() override = default; void on_dpi_changed(const wxRect &suggested_rect) override {} int GetNozzleCount(NozzleVolumeType volume_type) const; @@ -72,6 +75,7 @@ public: private: ComboBox *m_standard_choice{nullptr}; ComboBox *m_highflow_choice{nullptr}; + ComboBox *m_e3d_choice{nullptr}; Button *m_confirm_btn{nullptr}; wxStaticText *m_error_label{nullptr}; }; diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp index c391ddd017..f9fa3405d3 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp @@ -4,6 +4,8 @@ #include "StaticBox.hpp" #include "../wxExtensions.hpp" + +#include #include "../GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "../Utils/MacDarkMode.hpp" @@ -620,19 +622,34 @@ MultiSwitchButton::MultiSwitchButton(wxWindow *parent, wxWindowID id, const wxPo std::make_pair(0x6B6B6B, (int) StateColor::NotChecked), std::make_pair(0xFFFFFE, (int) StateColor::Normal))) , m_button_radius(10.0) - , m_button_padding(10, 6) + , m_button_padding(FromDIP(wxSize(11, 3))) { SetCornerRadius(m_button_radius); SetBorderWidth(0); - sizer = new wxBoxSizer(wxHORIZONTAL); - auto *hsizer = new wxBoxSizer(wxVERTICAL); - hsizer->Add(sizer, 1, wxEXPAND); - SetSizer(hsizer); - SetMinSize(wxSize(-1, 20)); + // Orca: a switch can hold more buttons than the layout has room for (a toolchanger lists one per + // tool), so they live in a scrolled area: the caller caps the switch at its natural width and + // this scrolls horizontally instead of clipping the last buttons. + m_scroll = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL | wxBORDER_NONE); + m_scroll->SetBackgroundColour(GetBackgroundColour()); + // The buttons are a single row, so only the horizontal bar may ever appear: a vertical one would + // eat into the row's height. + m_scroll->ShowScrollbars(wxSHOW_SB_DEFAULT, wxSHOW_SB_NEVER); + m_scroll->EnableScrolling(true, false); + m_scroll->SetScrollRate(FromDIP(10), 0); + sizer = new wxBoxSizer(wxHORIZONTAL); + m_scroll->SetSizer(sizer); + + auto *hsizer = new wxBoxSizer(wxVERTICAL); + hsizer->Add(m_scroll, 1, wxEXPAND); + SetSizer(hsizer); + SetMinSize(wxSize(-1, options_height())); + + Bind(wxEVT_SIZE, &MultiSwitchButton::on_size, this); Bind(wxEVT_COMMAND_BUTTON_CLICKED, &MultiSwitchButton::button_clicked, this); - SetFont(Label::Body_12); + // The tags name a tool and its volume type only, so they stay compact. + SetFont(Label::Body_10); } MultiSwitchButton::~MultiSwitchButton() @@ -640,10 +657,88 @@ MultiSwitchButton::~MultiSwitchButton() DeleteAllOptions(); } +int MultiSwitchButton::options_height() const +{ + // With no button to measure yet, keep the placeholder height the switch starts with. + return btns.empty() ? FromDIP(20) : btns.front()->GetMinSize().y; +} + +void MultiSwitchButton::update_scroll_range() +{ + // The scrollbar range is measured against the virtual size, so it has to follow the buttons + // whenever their labels or count change. + m_scroll->InvalidateBestSize(); + m_scroll->FitInside(); + + // A scrolled window reports its min size plus a scrollbar as its best size, never the width of + // the buttons it holds, so the layout has to be given that width explicitly. It is also the + // widest this switch wants to be: a row with less room squeezes it below this and it scrolls. + const wxSize content = sizer->CalcMin(); + SetMinSize(wxSize(content.x, options_height() + scrollbar_height(content.x))); + SetMaxSize(m_fit_to_options ? wxSize(content.x, -1) : wxDefaultSize); + InvalidateBestSize(); +} + +int MultiSwitchButton::scrollbar_height(int options_width) const +{ + // The bar is drawn inside the switch, so while the buttons need more width than the row gave us + // the switch has to be taller by the bar's height, or the bar sits on top of the buttons. + const int width = GetClientSize().x; + if (width <= 0 || options_width <= width) + return 0; + + const int bar = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y, this); + return bar > 0 ? bar : 0; +} + +void MultiSwitchButton::on_size(wxSizeEvent &evt) +{ + evt.Skip(); + + // The row resized, so the buttons may now overflow it (or no longer fit in it) and the room the + // bar needs changed with that. Width does not depend on height, so this settles in one pass. + const int height = options_height() + scrollbar_height(sizer->CalcMin().x); + if (GetMinSize().y != height) { + SetMinSize(wxSize(GetMinSize().x, height)); + // The switch sits in a row of this tab, and the tab in a panel that shares its height + // with the page view, so both have to lay out again for the taller row to get its room. + if (wxWindow *tab = GetParent()) { + tab->Layout(); + if (wxWindow *panel = tab->GetParent()) + panel->Layout(); + } + } +} + +void MultiSwitchButton::scroll_option_into_view(Button *btn) +{ + const int width = m_scroll->GetClientSize().x; + const int view_x = m_scroll->GetViewStartPixels().x; + if (width <= 0) // not laid out yet: there is no view to scroll + return; + + const wxRect rect = btn->GetRect(); + const int right = rect.GetRight() + 1; + int target = view_x; + if (rect.x < view_x) + target = rect.x; + else if (right > view_x + width) + target = right - width; + + if (target == view_x) + return; + + // Scroll() counts scroll units; round up so the whole button ends up inside the view rather + // than a few pixels short of it. + int step = 1; + m_scroll->GetScrollPixelsPerUnit(&step, nullptr); + m_scroll->Scroll((target + step - 1) / step, -1); +} + int MultiSwitchButton::AppendOption(const wxString &option, void *clientData) { Button *btn = new Button(); - btn->Create(this, option, "", wxBORDER_NONE); + btn->Create(m_scroll, option, "", wxBORDER_NONE); btn->SetFont(GetFont()); btn->SetBackgroundColor(m_bg_color); btn->SetTextColor(m_text_color); @@ -654,9 +749,6 @@ int MultiSwitchButton::AppendOption(const wxString &option, void *clientData) btns.push_back(btn); sizer->Add(btn, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); - wxSize text_size = btn->GetTextExtent(option); - btn->SetMinSize(wxSize(text_size.x + m_button_padding.x * 2 + 6, -1)); - return int(btns.size()) - 1; } @@ -666,6 +758,7 @@ void MultiSwitchButton::SetOptions(const std::vector &options) for (const auto &option : options) AppendOption(option); + update_scroll_range(); Layout(); Refresh(); } @@ -700,6 +793,8 @@ void MultiSwitchButton::SetSelection(int index) sel = index; update_button_styles(); send_selection_event(); + // The selected button may be scrolled out of sight, e.g. when the tab restores the active tool. + scroll_option_into_view(btns[sel]); Refresh(); } @@ -718,6 +813,7 @@ void MultiSwitchButton::SetOptionText(unsigned int index, const wxString &text) if (index >= btns.size()) return; btns[index]->SetLabel(text); + update_scroll_range(); } void *MultiSwitchButton::GetOptionData(unsigned int index) const @@ -769,6 +865,7 @@ void MultiSwitchButton::SetButtonPadding(const wxSize &padding) m_button_padding = padding; for (auto *btn : btns) btn->SetPaddingSize(padding); + update_scroll_range(); Layout(); Refresh(); } @@ -777,6 +874,8 @@ void MultiSwitchButton::Rescale() { for (auto *btn : btns) btn->Rescale(); + // Rescaling can change how the labels measure, and the scrollbar range follows the buttons. + update_scroll_range(); } void MultiSwitchButton::button_clicked(wxCommandEvent &event) diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp index 6e271abfaf..decff25919 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp @@ -7,6 +7,7 @@ #include #include +#include #include #include "Button.hpp" @@ -164,6 +165,10 @@ public: void SetButtonCornerRadius(double radius); void SetButtonPadding(const wxSize &padding); + // Keep the switch exactly as wide as the buttons need instead of letting the layout stretch it. + // A layout with less room than that still squeezes it, and it scrolls its buttons then. + void SetFitToOptions(bool fit = true) { m_fit_to_options = fit; update_scroll_range(); } + void Rescale(); protected: @@ -173,9 +178,20 @@ protected: bool send_selection_event(); private: + // Height of the single button row, measured from the buttons themselves. + int options_height() const; + void update_scroll_range(); + int scrollbar_height(int options_width) const; + void scroll_option_into_view(Button *btn); + void on_size(wxSizeEvent &evt); + std::vector